tr2/option/passport: rewrite and simplify

Resolves #2346. Resolves #2263.
LostArtefacts · Feb 10, 2025 · 6009a57 · 6009a57
1 parent 360c1cd
commit 6009a57
Show file tree

Hide file tree

Showing 6 changed files with 258 additions and 218 deletions.
diff --git a/docs/tr2/CHANGELOG.md b/docs/tr2/CHANGELOG.md
@@ -52,6 +52,7 @@
 - fixed gunflare from bandits in Tibetan levels spawning too far from their guns (#2365, regression from 0.8)
 - fixed guns sometimes appearing in Lara's hands when entering the fly cheat while undrawing weapons (#2376, regression from 0.3)
 - fixed the `/play` console command not resetting Lara's inventory (#2267, regression from 0.3)
+- fixed flashing text when trying to exit passport while Lara is dead and an action is required (#2263)
 - improved rendering to achieve a slight performance boost in big rooms (#2325)
 - improved wireframe mode appearance around screen edges
 

diff --git a/src/tr2/decomp/savegame.c b/src/tr2/decomp/savegame.c
@@ -1060,7 +1060,7 @@ bool S_FrontEndCheck(void)
         if (!File_Exists(file_name)) {
             Requester_AddItem(
                 &g_LoadGameRequester, GS(MISC_EMPTY_SLOT), 0, 0, 0);
-            g_SavedLevels[i] = 0;
+            g_SavedLevels[i] = false;
         } else {
             MYFILE *const fp = File_Open(file_name, FILE_OPEN_READ);
             char level_title[80];
@@ -1079,7 +1079,7 @@ bool S_FrontEndCheck(void)
                 g_SaveCounter = save_num;
                 g_LoadGameRequester.selected = i;
             }
-            g_SavedLevels[i] = 1;
+            g_SavedLevels[i] = true;
             g_SavedGames++;
         }
     }
@@ -1132,7 +1132,7 @@ int32_t S_SaveGame(const int32_t slot_num)
 
     m_ReqFlags1[slot_num] = g_RequesterFlags1[slot_num];
     m_ReqFlags2[slot_num] = g_RequesterFlags2[slot_num];
-    g_SavedLevels[slot_num] = 1;
+    g_SavedLevels[slot_num] = true;
     g_SaveCounter++;
     g_SavedGames++;