From 129a591a2eff9ae92170d6cecad1bca085166de6 Mon Sep 17 00:00:00 2001 From: Terry Hearst Date: Mon, 6 Feb 2023 20:21:33 -0500 Subject: [PATCH 1/3] Fixes for compiling web build --- src/Console.hx | 2 ++ src/MarbleWorld.hx | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/src/Console.hx b/src/Console.hx index 78ad2469..7c1f2204 100644 --- a/src/Console.hx +++ b/src/Console.hx @@ -1,6 +1,8 @@ package src; +#if !js import sys.FileSystem; +#end import mis.MisParser; import src.Settings; import src.Debug; diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index 00d12d56..53107041 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -1,6 +1,8 @@ package src; +#if !js import gui.ReplayCenterGui; +#end import gui.ReplayNameDlg; import collision.Collision; import shapes.MegaMarble; @@ -1164,8 +1166,13 @@ class MarbleWorld extends Scheduler { } this.setCursorLock(false); this.dispose(); + #if !js MarbleGame.canvas.setContent(new ReplayCenterGui()); + #end #if js + var pmg = new PlayMissionGui(); + PlayMissionGui.currentSelectionStatic = mission.index + 1; + MarbleGame.canvas.setContent(pmg); var pointercontainer = js.Browser.document.querySelector("#pointercontainer"); pointercontainer.hidden = false; #end From c7191ad45e88f6a4de7b0d0f1cb5de5c9a4601d1 Mon Sep 17 00:00:00 2001 From: Terry Hearst Date: Mon, 6 Feb 2023 21:01:07 -0500 Subject: [PATCH 2/3] Actually, go back to the main menu lol --- src/MarbleWorld.hx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/MarbleWorld.hx b/src/MarbleWorld.hx index 53107041..78653d60 100644 --- a/src/MarbleWorld.hx +++ b/src/MarbleWorld.hx @@ -1,6 +1,8 @@ package src; -#if !js +#if js +import gui.MainMenuGui; +#else import gui.ReplayCenterGui; #end import gui.ReplayNameDlg; @@ -1170,9 +1172,7 @@ class MarbleWorld extends Scheduler { MarbleGame.canvas.setContent(new ReplayCenterGui()); #end #if js - var pmg = new PlayMissionGui(); - PlayMissionGui.currentSelectionStatic = mission.index + 1; - MarbleGame.canvas.setContent(pmg); + MarbleGame.canvas.setContent(new MainMenuGui()); var pointercontainer = js.Browser.document.querySelector("#pointercontainer"); pointercontainer.hidden = false; #end From 5d2915f5860f1be67b960b80bb29ec1c8315ff25 Mon Sep 17 00:00:00 2001 From: Terry Hearst Date: Mon, 6 Feb 2023 21:30:12 -0500 Subject: [PATCH 3/3] Go to the correct menu when quitting a demo --- src/MarbleGame.hx | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/MarbleGame.hx b/src/MarbleGame.hx index 54ad3e9c..15d118f8 100644 --- a/src/MarbleGame.hx +++ b/src/MarbleGame.hx @@ -1,5 +1,9 @@ package src; +import gui.MainMenuGui; +#if !js +import gui.ReplayCenterGui; +#end import gui.ReplayNameDlg; import gui.ConsoleDlg; import src.Replay; @@ -249,12 +253,20 @@ class MarbleGame { Console.log("Quitting mission"); world.setCursorLock(false); paused = false; - var pmg = new PlayMissionGui(); - PlayMissionGui.currentSelectionStatic = world.mission.index; - PlayMissionGui.currentGameStatic = world.mission.game; + if (world.isWatching) { + #if !js + canvas.setContent(new ReplayCenterGui()); + #else + canvas.setContent(new MainMenuGui()); + #end + } else { + var pmg = new PlayMissionGui(); + PlayMissionGui.currentSelectionStatic = world.mission.index; + PlayMissionGui.currentGameStatic = world.mission.game; + canvas.setContent(pmg); + } world.dispose(); world = null; - canvas.setContent(pmg); Settings.save(); }