setup: fix equipping weapons on start

Fixes #439
LostArtefacts · Feb 16, 2022 · 82e7368 · 82e7368
1 parent 5a0e699
commit 82e7368
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 ## [Unreleased](https://github.com/rr-/Tomb1Main/compare/2.6...master)
-- ...
+- fixed equipping gun after starting the game (#439, regression from 2.6)
 
 ## [2.6](https://github.com/rr-/Tomb1Main/compare/2.5...2.6) - 2022-02-16
 - added deaths counter (#388, requires new saves)

diff --git a/src/game/game.c b/src/game/game.c
@@ -41,13 +41,13 @@ bool StartGame(int32_t level_num, GAMEFLOW_LEVEL_TYPE level_type)
             LOG_ERROR("Failed to load save file!");
             return false;
         }
-
-        // LaraGun() expects request_gun_type to be set only when it
-        // really is needed, not at all times.
-        // https://github.com/rr-/Tomb1Main/issues/36
-        g_Lara.request_gun_type = LGT_UNARMED;
     }
 
+    // LaraGun() expects request_gun_type to be set only when it
+    // really is needed, not at all times.
+    // https://github.com/rr-/Tomb1Main/issues/36
+    g_Lara.request_gun_type = LGT_UNARMED;
+
     return true;
 }