[MX, GL, EE] Fixes crash when completing the game or on game over

TheFakeMontyOnTheRun · Jul 1, 2024 · 0164108 · 0164108
1 parent e376830
commit 0164108
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/common/include/Enums.h b/common/include/Enums.h
@@ -12,7 +12,8 @@ enum EDirection {
 enum CrawlerState {
     kCrawlerGameOver = -1,
     kCrawlerQuit = 0,
-    kCrawlerGameInProgress = 1
+    kCrawlerGameInProgress = 1,
+    kCrawlerGameFinished = 2
 };
 
 enum ECommand {

diff --git a/common/src/Dungeon.c b/common/src/Dungeon.c
@@ -295,18 +295,22 @@ struct GameSnapshot dungeonTick(const enum ECommand command) {
 
         switch (getGameStatus()) {
             case kBadVictory:
+                gameSnapshot.should_continue = kCrawlerGameFinished;
                 enterState(kBadVictoryEpilogue);
                 return gameSnapshot;
 
             case kBadGameOver:
+                gameSnapshot.should_continue = kCrawlerGameFinished;
                 enterState(kBadGameOverEpilogue);
                 return gameSnapshot;
 
             case kGoodVictory:
+                gameSnapshot.should_continue = kCrawlerGameFinished;
                 enterState(kGoodVictoryEpilogue);
                 return gameSnapshot;
 
             case kGoodGameOver:
+                gameSnapshot.should_continue = kCrawlerGameFinished;
                 enterState(kGoodGameOverEpilogue);
                 return gameSnapshot;
             default:

diff --git a/common/src/Events.c b/common/src/Events.c
@@ -147,6 +147,10 @@ int loopTick(enum ECommand command) {
 
         tickMission(command);
 
+        if (crawlerGameState == kCrawlerGameFinished) {
+            return kCrawlerGameFinished;
+        }
+
         if (gameTicks != 0) {
             yCameraOffset = ((struct CTile3DProperties *) getFromMap(&tileProperties,
                                                                      LEVEL_MAP(x, z)))->mFloorHeight -