From 6074f9a5fbae2ea4d4fe48540ef361dcb0c3118a Mon Sep 17 00:00:00 2001
From: lahm86 <33758420+lahm86@users.noreply.github.com>
Date: Sat, 25 Jan 2025 13:55:35 +0000
Subject: [PATCH] tr2/lara/cheat: reset gun status if undrawing weapons

This fixes guns potentially appearing in Lara's hand while entering the
fly cheat and the weapon undraw animation is still running.

Resolves #2376.
---
 docs/tr2/CHANGELOG.md     | 1 +
 src/tr2/game/lara/cheat.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/tr2/CHANGELOG.md b/docs/tr2/CHANGELOG.md
index 92c64cf87..77626fabf 100644
--- a/docs/tr2/CHANGELOG.md
+++ b/docs/tr2/CHANGELOG.md
@@ -39,6 +39,7 @@
 - fixed Skidoo snow wake effects at slow speeds (#2324, regression from 0.6)
 - fixed software renderer skybox occlusion issues (#2343, regression from 0.7)
 - fixed gunflare from bandits in Tibetan levels spawning too far from their guns (#2365, regression from 0.8)
+- fixed guns sometimes appearing in Lara's hands when entering the fly cheat while undrawing weapons (#2376, regression from 0.3)
 - improved rendering to achieve a slight performance boost in big rooms (#2325)
 
 ## [0.8](https://github.com/LostArtefacts/TRX/compare/tr2-0.8...tr2-0.8) - 2025-01-01
diff --git a/src/tr2/game/lara/cheat.c b/src/tr2/game/lara/cheat.c
index c16abd012..f25e12018 100644
--- a/src/tr2/game/lara/cheat.c
+++ b/src/tr2/game/lara/cheat.c
@@ -124,7 +124,8 @@ bool Lara_Cheat_EnterFlyMode(void)
         M_ResetGunStatus();
     }
 
-    if (g_Lara.gun_status == LGS_HANDS_BUSY) {
+    if (g_Lara.gun_status == LGS_HANDS_BUSY
+        || (g_Lara.gun_status == LGS_UNDRAW && g_Lara.back_gun != O_LARA)) {
         g_Lara.gun_status = LGS_ARMLESS;
     }