lara: fix revert_to_pistols ignoring gameflow's remove_guns

LostArtefacts · Aug 3, 2022 · 5536793 · 5536793
1 parent 74c8fcf
commit 5536793
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## [Unreleased](https://github.com/rr-/Tomb1Main/compare/stable...develop)
+- fixed revert_to_pistols ignoring gameflow's remove_guns (#603)
 
 ## [2.10.1](https://github.com/rr-/Tomb1Main/compare/2.10...2.10.1) - 2022-07-27
 - fixed Lara being able to equip pistols in the gym level (#594)

diff --git a/src/game/lara/lara.c b/src/game/lara/lara.c
@@ -567,7 +567,8 @@ void Lara_InitialiseInventory(int32_t level_num)
 
     g_Lara.gun_status = resume->gun_status;
 
-    if (g_Config.revert_to_pistols && level_num != g_GameFlow.gym_level_num) {
+    if (g_Config.revert_to_pistols
+        && g_GameInfo.current[level_num].flags.got_pistols != 0) {
         g_Lara.request_gun_type = LGT_PISTOLS;
         g_Lara.gun_type = LGT_PISTOLS;
     } else {