tr2/game_flow: fix losing NG+ flag in saves

This postpones the fix for #2515 in TR2 because of the way the original savegame is loaded; the bonus flag is otherwise lost because of the sequence of events. Resolves #2566.
LostArtefacts · Mar 2, 2025 · 620dd67 · 620dd67
1 parent 18fa738
commit 620dd67
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/docs/tr2/CHANGELOG.md b/docs/tr2/CHANGELOG.md
@@ -9,6 +9,7 @@
 - fixed extremely large item quantities crashing the game (#2497, regression from 0.3)
 - fixed missing new game text in the passport when play any level is enabled (#2563, regression from 0.9)
 - fixed the play any level dialog not showing in the gym passport (#2564, regression from 0.9)
+- fixed losing the NG+ flag when loading a save that has it set (#2566, regression from 0.9.2)
 
 ## [0.9.2](https://github.com/LostArtefacts/TRX/compare/tr2-0.9.1...tr2-0.9.2) - 2025-02-19
 - fixed secret rewards not handed out after loading a save (#2528, regression from 0.8)

diff --git a/src/tr2/game/game_flow/sequencer_events.c b/src/tr2/game/game_flow/sequencer_events.c
@@ -268,9 +268,8 @@ void GF_PreSequenceHook(
     g_GF_RemoveAmmo = false;
     g_GF_RemoveWeapons = false;
     g_GF_NumSecrets = 3;
-    if (seq_ctx == GFSC_SAVED) {
-        g_SaveGame.bonus_flag = false;
-    }
+    // TODO: reset bonus flag if seq_ctx == GFSC_SAVED once S_LoadGame logic is
+    // merged with overall save loading logic.
     Camera_GetCineData()->position.target_angle = DEG_90;
 }