savegame: fix death counter

Resolves #575 and #576
LostArtefacts · May 30, 2022 · 59209cf · 59209cf
1 parent 9370710
commit 59209cf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,8 @@
 - fixed the new game and save game passport options using the wrong closing animation (#542, regression from 2.7)
 - fixed bridges at floor level appearing under the floor (#523)
 - fixed Lara's outfit in Lara's Home when replaying the level (#571, regression from 2.7)
+- fixed crash when dying in the gym level with no saves (#576, regression from 2.8)
+- fixed exiting select level menu causing deaths in a new game incremented in that slot (#575, regression from 2.8)
 - removed DInput-based XBox controller support
 
 ## [2.8.1](https://github.com/rr-/Tomb1Main/compare/2.8.1...2.8.2) - 2022-05-20

diff --git a/src/game/inventory/inventory.c b/src/game/inventory/inventory.c
@@ -947,7 +947,7 @@ int32_t Inv_Display(int inv_mode)
         }
 
     case O_PHOTO_OPTION:
-        g_GameInfo.current_save_slot = 0;
+        g_GameInfo.current_save_slot = -1;
         return GF_START_GYM | g_GameFlow.gym_level_num;
 
     case O_GUN_OPTION:

diff --git a/src/game/option/option_passport.c b/src/game/option/option_passport.c
@@ -161,6 +161,7 @@ static void Option_PassportShowNewGame(void)
                 g_GameInfo.bonus_flag = 0;
                 break;
             }
+            g_GameInfo.current_save_slot = -1;
             g_GameInfo.passport_mode = PASSPORT_MODE_NEW_GAME;
             g_GameInfo.save_initial_version = SAVEGAME_CURRENT_VERSION;
         } else if (