thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix replay exit bug

Browse source
This commit is contained in:
RandomityGuy 2023-07-23 19:23:09 +05:30
parent 7f17e32ad3
commit 773efdd8dd
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/MarbleGame.hx
View file

@ -53,6 +53,7 @@ class MarbleGame {
var console:ConsoleDlg; var console:ConsoleDlg;
var _mouseWheelDelta:Float; var _mouseWheelDelta:Float;
var _exitingToMenu:Bool = false;
public function new(scene2d:h2d.Scene, scene:h3d.scene.Scene) { public function new(scene2d:h2d.Scene, scene:h3d.scene.Scene) {
Console.log("Initializing the game..."); Console.log("Initializing the game...");
@ -289,7 +290,12 @@ class MarbleGame {
#end #end
} else { } else {
var pmg = new LevelSelectGui(LevelSelectGui.currentDifficultyStatic); var pmg = new LevelSelectGui(LevelSelectGui.currentDifficultyStatic);
canvas.setContent(pmg); if (_exitingToMenu) {
_exitingToMenu = false;
canvas.setContent(new MainMenuGui());
} else {
canvas.setContent(pmg);
}
} }
Settings.save(); Settings.save();

2
src/gui/ExitGameDlg.hx
View file

@ -99,8 +99,8 @@ class ExitGameDlg extends GuiImage {
btnList.addButton(4, "Main Menu", (evt) -> { btnList.addButton(4, "Main Menu", (evt) -> {
MarbleGame.canvas.pushDialog(new MessageBoxYesNoDlg("Are you sure you want to exit this level? You will lose your current level progress.", MarbleGame.canvas.pushDialog(new MessageBoxYesNoDlg("Are you sure you want to exit this level? You will lose your current level progress.",
() -> { () -> {
MarbleGame.instance._exitingToMenu = true;
yesFunc(btnList); yesFunc(btnList);
MarbleGame.canvas.setContent(new MainMenuGui());
}, () -> {})); }, () -> {}));
}); });
} }

2
src/gui/MainMenuGui.hx
View file

@ -37,6 +37,8 @@ class MainMenuGui extends GuiImage {
var scene2d = MarbleGame.instance.scene2d; var scene2d = MarbleGame.instance.scene2d;
#end #end
MarbleGame.instance.toRecord = false;
var offsetX = (scene2d.width - 1280) / 2; var offsetX = (scene2d.width - 1280) / 2;
var offsetY = (scene2d.height - 720) / 2; var offsetY = (scene2d.height - 720) / 2;