thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2026-02-23 14:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7 from thearst3rd/mbp-fix-web

Browse source 
Fixes for compiling web build
This commit is contained in:
RandomityGuy 2023-02-07 08:43:45 +05:30 • committed by GitHub
commit c439b32338
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Console.hx
View file

@ -1,6 +1,8 @@
package src;
#if !js
import sys.FileSystem;
#end
import mis.MisParser;
import src.Settings;
import src.Debug;

20
src/MarbleGame.hx
View file

@ -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();
}

7
src/MarbleWorld.hx
View file

@ -1,6 +1,10 @@
package src;
#if js
import gui.MainMenuGui;
#else
import gui.ReplayCenterGui;
#end
import gui.ReplayNameDlg;
import collision.Collision;
import shapes.MegaMarble;
@ -1164,8 +1168,11 @@ class MarbleWorld extends Scheduler {
}
this.setCursorLock(false);
this.dispose();
#if !js
MarbleGame.canvas.setContent(new ReplayCenterGui());
#end
#if js
MarbleGame.canvas.setContent(new MainMenuGui());
var pointercontainer = js.Browser.document.querySelector("#pointercontainer");
pointercontainer.hidden = false;
#end