fix Lara drawing guns when loading OG saves (closes #36)

LostArtefacts · Feb 28, 2021 · 2f547c1 · 2f547c1
1 parent 00e3af2
commit 2f547c1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/game/laramisc.c b/src/game/laramisc.c
@@ -510,11 +510,7 @@ void InitialiseLaraInventory(int32_t level_num)
 
     Lara.gun_status = start->gun_status;
     Lara.gun_type = start->gun_type;
-#ifdef T1M_FEAT_INPUT
-    Lara.request_gun_type = LGT_UNARMED;
-#else
     Lara.request_gun_type = start->gun_type;
-#endif
 
     LaraInitialiseMeshes(level_num);
     InitialiseNewWeapon();

diff --git a/src/game/setup.c b/src/game/setup.c
@@ -74,6 +74,13 @@ int32_t InitialiseLevel(int level_num)
         ExtractSaveGameInfo();
     }
 
+#ifdef T1M_FEAT_INPUT
+    // LaraGun() expects request_gun_type to be set only when it really is
+    // needed (see https://github.com/rr-/Tomb1Main/issues/36), not at all
+    // times.
+    Lara.request_gun_type = LGT_UNARMED;
+#endif
+
     if (LevelMusic[CurrentLevel]) {
         S_CDPlay(LevelMusic[CurrentLevel]);
     }