lara: fix ng+ issues

LostArtefacts · Aug 14, 2024 · c3740a4 · c3740a4
1 parent 65bed6e
commit c3740a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/game/lara/lara.c b/src/game/lara/lara.c
@@ -614,7 +614,9 @@ void Lara_RevertToPistolsIfNeeded(void)
     g_Lara.gun_type = LGT_PISTOLS;
     g_Lara.request_gun_type = LGT_PISTOLS;
 
-    g_Lara.holsters_gun_type = LGT_UNARMED;
+    if (g_Lara.holsters_gun_type == LGT_PISTOLS) {
+        g_Lara.holsters_gun_type = LGT_UNARMED;
+    }
     if (Inv_RequestItem(O_SHOTGUN_ITEM)) {
         g_Lara.back_gun_type = LGT_SHOTGUN;
     } else {

diff --git a/src/game/savegame/savegame.c b/src/game/savegame/savegame.c
@@ -283,6 +283,7 @@ void Savegame_ApplyLogicToCurrentInfo(int level_num)
         current->magnum_ammo = 1234;
         current->uzi_ammo = 1234;
         current->equipped_gun_type = LGT_UZIS;
+        current->holsters_gun_type = LGT_UZIS;
     }
 
     // Fallback logic to figure out holster and back gun items for versions 4.2