stats: fix game hanging if exited during stats or credits

Resolves #1585.
LostArtefacts · Oct 30, 2024 · b8f5aa4 · b8f5aa4
1 parent b80a492
commit b8f5aa4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/docs/tr2/CHANGELOG.md b/docs/tr2/CHANGELOG.md
@@ -16,6 +16,7 @@
 - fixed the dragon reviving itself after Lara removes the dagger in rare circumstances (#1572)
 - fixed grenades counting as double kills in the game statistics (#1560)
 - fixed the ammo counter being hidden while a demo plays in NG+ (#1559)
+- fixed the game hanging if exited during the level stats, credits, or final stats (#1585)
 
 ## [0.5](https://github.com/LostArtefacts/TRX/compare/afaf12a...tr2-0.5) - 2024-10-08
 - added `/sfx` command

diff --git a/docs/tr2/README.md b/docs/tr2/README.md
@@ -32,6 +32,7 @@ decompilation process. We recognize that there is much work to be done.
 - fixed the dragon reviving itself after Lara removes the dagger in rare circumstances
 - fixed grenades counting as double kills in the game statistics
 - fixed the ammo counter being hidden while a demo plays in NG+
+- fixed the game hanging if exited during the level stats, credits, or final stats
 
 #### Visuals
 

diff --git a/src/tr2/decomp/stats.c b/src/tr2/decomp/stats.c
@@ -323,6 +323,10 @@ int32_t __cdecl LevelStats(const int32_t level_num)
 
         Input_Update();
 
+        if (g_IsGameToExit) {
+            break;
+        }
+
         if (g_GF_OverrideDir != (GAME_FLOW_DIR)-1) {
             break;
         }
@@ -369,6 +373,10 @@ int32_t __cdecl GameStats(const int32_t level_num)
 
         Input_Update();
 
+        if (g_IsGameToExit) {
+            break;
+        }
+
         if (g_GF_OverrideDir != (GAME_FLOW_DIR)-1) {
             break;
         }