restart fixes, cleanup

mswieboda · May 1, 2021 · 925a48f · 925a48f
1 parent c7766e2
commit 925a48f
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/assets/levels/layers.dat → assets/levels/playground.dat b/assets/levels/layers.dat → assets/levels/playground.dat
diff --git a/source/Main.hx b/source/Main.hx
@@ -1,30 +1,37 @@
 package;
 
-import escape.PlayState;
 import escape.MenuState;
 
 import flixel.FlxG;
 import flixel.FlxGame;
-import flixel.FlxState;
 import openfl.display.Sprite;
 
 class Main extends Sprite {
+  public static var env: String;
+
   static inline var TEST = "TEST";
 
   public function new() {
+    getEnv();
+
     super();
 
+    if (env == TEST) FlxG.debugger.drawDebug = true;
+
+    addChild(new FlxGame(0, 0, MenuState, 1, 60, 60, true, false));
+  }
+
+
+  public static function getEnv(): String {
+    if (env != null) return env;
+
 #if web
-    var env = "";
+    env = "";
 #else
-    var env = Sys.getEnv("ENV");
+    env = Sys.getEnv("ENV");
 #end
     env = env != null ? env.toUpperCase() : env;
 
-    var state: Class<FlxState> = MenuState;
-
-    if (env == TEST) FlxG.debugger.drawDebug = true;
-
-    addChild(new FlxGame(0, 0, state, 1, 60, 60, true, false));
+    return env;
   }
 }
diff --git a/source/escape/BaseLevelState.hx b/source/escape/BaseLevelState.hx
@@ -53,7 +53,7 @@ class BaseLevelState extends FlxState {
     player.updateBeforeCollisionChecks();
     level.updateCollisions(player);
 
-    if (!player.alive && subState == null) openSubState(new GameOverMenu());
+    if (!player.alive && subState == null) openSubState(new GameOverMenu(this));
     if (Actions.game.menu.triggered) openSubState(new PauseMenu(this));
   }
 }
diff --git a/source/escape/GameOverMenu.hx b/source/escape/GameOverMenu.hx
@@ -5,11 +5,11 @@ import flixel.FlxSubState;
 import flixel.text.FlxText;
 
 class GameOverMenu extends PlayMenu {
-  public function new() {
+  public function new(levelState: BaseLevelState) {
     var title = "Game Over!";
     var parentPersistentUpdate = true;
     var itemData = [
-      { name: "restart", action: name -> FlxG.switchState(new PlayState()) },
+      { name: "restart", action: name -> levelState.restart() },
       { name: "exit", action: name -> FlxG.switchState(new MenuState()) }
     ];
 

diff --git a/source/escape/IntroState.hx b/source/escape/IntroState.hx
diff --git a/source/escape/LevelState.hx b/source/escape/LevelState.hx
@@ -5,7 +5,7 @@ import flixel.FlxG;
 class LevelState extends BaseLevelState {
   var levelFileName: String;
 
-  public function new(levelFileName: String = AssetPaths.level__dat) {
+  public function new(levelFileName) {
     this.levelFileName = levelFileName;
 
     var player = new Player();

diff --git a/source/escape/MenuState.hx b/source/escape/MenuState.hx
@@ -24,8 +24,8 @@ class MenuState extends FlxState {
     title.screenCenter(FlxAxes.X);
 
     var menuItems = new MenuItems(title.y + title.height + PADDING, [
-      { name: "start", action: name -> FlxG.switchState(new LevelState(AssetPaths.intro__dat)) },
-      { name: "playground", action: name -> FlxG.switchState(new PlayState()) },
+      { name: "start", action: name -> FlxG.switchState(new PlayState(AssetPaths.level__dat)) },
+      { name: "playground", action: name -> FlxG.switchState(new LevelState(AssetPaths.playground__dat)) },
       { name: "settings", action: name -> FlxG.switchState(new MenuState()) },
       { name: "level editor", action: name -> FlxG.switchState(new LevelEditorState()) },
       { name: "credits", action: name -> FlxG.switchState(new MenuState()) },

diff --git a/source/escape/PlayState.hx b/source/escape/PlayState.hx
@@ -5,10 +5,6 @@ import flixel.FlxG;
 class PlayState extends LevelState {
   var topSpikes: TopSpikes;
 
-  public function new() {
-    super(AssetPaths.level__dat);
-  }
-
   override function addLevel() {
     super.addLevel();