mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2025-10-30 08:11:25 +00:00
this critical
This commit is contained in:
parent
c348dfb530
commit
cec3bc6776
2 changed files with 4 additions and 3 deletions
|
|
@ -291,7 +291,7 @@ class MarbleWorld extends Scheduler {
|
||||||
|
|
||||||
public function initLoading() {
|
public function initLoading() {
|
||||||
Console.log("*** LOADING MISSION: " + mission.path);
|
Console.log("*** LOADING MISSION: " + mission.path);
|
||||||
this.loadingGui = new LoadingGui(this.mission.title, this.mission.game);
|
this.loadingGui = new LoadingGui(this.mission.title, this.mission.game, this.isMultiplayer);
|
||||||
MarbleGame.canvas.setContent(this.loadingGui);
|
MarbleGame.canvas.setContent(this.loadingGui);
|
||||||
if (this.mission.isClaMission) {
|
if (this.mission.isClaMission) {
|
||||||
this.mission.download(() -> loadBegin());
|
this.mission.download(() -> loadBegin());
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ import src.Util;
|
||||||
class LoadingGui extends GuiImage {
|
class LoadingGui extends GuiImage {
|
||||||
public var setProgress:Float->Void;
|
public var setProgress:Float->Void;
|
||||||
|
|
||||||
public function new(missionName:String, game:String) {
|
public function new(missionName:String, game:String, isMultiplayer:Bool = false) {
|
||||||
function chooseBg() {
|
function chooseBg() {
|
||||||
if (game == "gold")
|
if (game == "gold")
|
||||||
return ResourceLoader.getImage('data/ui/backgrounds/gold/${cast (Math.floor(Util.lerp(1, 12, Math.random())), Int)}.jpg');
|
return ResourceLoader.getImage('data/ui/backgrounds/gold/${cast (Math.floor(Util.lerp(1, 12, Math.random())), Int)}.jpg');
|
||||||
|
|
@ -76,6 +76,7 @@ class LoadingGui extends GuiImage {
|
||||||
|
|
||||||
loadingGui.addChild(mapName);
|
loadingGui.addChild(mapName);
|
||||||
loadingGui.addChild(progress);
|
loadingGui.addChild(progress);
|
||||||
|
if (!isMultiplayer)
|
||||||
loadingGui.addChild(cancelButton);
|
loadingGui.addChild(cancelButton);
|
||||||
loadingGui.addChild(overlay);
|
loadingGui.addChild(overlay);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue