Fix #466: Don't go to unplayable next level

(cherry picked from commit 13207acafa90890d2ab28a05fe56f25c26d28fd7)
SimonN · Jun 18, 2023 · 9123d99 · 9123d99
1 parent 1525eb5
commit 9123d99
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/game/core/game.d b/src/game/core/game.d
@@ -108,7 +108,8 @@ public:
     this(ArgsToCreateGame args)
     in {
         assert (args.level !is null);
-        assert (args.level.playable);
+        assert (args.level.playable,
+            "Level is not playable. Don't create a Game for this.");
         assert (args.levelFilename !is null);
     }
     do {

diff --git a/src/menu/outcome/single.d b/src/menu/outcome/single.d
@@ -221,5 +221,10 @@ public:
         return _nextLevel;
     }
 
+    override bool execute() const pure nothrow @safe @nogc
+    {
+        return super.execute && _nextLevel.level.playable;
+    }
+
     void dispose() { _preview.dispose(); }
 }