demo: fix equipping weapons on start

Resolves #440
LostArtefacts · Feb 17, 2022 · c100ef0 · c100ef0
1 parent bdb481c
commit c100ef0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
 ## [Unreleased](https://github.com/rr-/Tomb1Main/compare/2.6.1...master)
-- ...
+- fixed equipping gun after starting a demo (#440, regression from 2.6)
 
 ## [2.6.1](https://github.com/rr-/Tomb1Main/compare/2.6...2.6.1) - 2022-02-16
 - fixed equipping gun after starting the game (#439, regression from 2.6)

diff --git a/src/game/demo.c b/src/game/demo.c
@@ -66,6 +66,11 @@ int32_t StartDemo()
         Random_SeedDraw(0xD371F947);
         Random_SeedControl(0xD371F947);
 
+        // 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;
+
         txt = Text_Create(0, -16, g_GameFlow.strings[GS_MISC_DEMO_MODE]);
         Text_Flash(txt, 1, 20);
         Text_AlignBottom(txt, 1);