gun: fix early hiding of pistol meshes

Resolves #1449.
LostArtefacts · Aug 23, 2024 · 8f75872 · 8f75872
1 parent 84cc44d
commit 8f75872
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ## [Unreleased](https://github.com/LostArtefacts/TR1X/compare/stable...develop) - ××××-××-××
+- fixed holstering pistols hiding the gun meshes 1 frame too early (#1449, regression from 0.6)
 - improved logs module names readability
 - improved crash debug information on Windows
 

diff --git a/src/game/gun/gun_pistols.c b/src/game/gun/gun_pistols.c
@@ -44,11 +44,11 @@ void Gun_Pistols_Undraw(const LARA_GUN_TYPE weapon_type)
         g_Lara.left_arm.rot.y = 0;
         g_Lara.left_arm.rot.z = 0;
         anil = LF_G_DRAW_END;
+    } else if (Anim_TestAbsFrameEqual(anil, LF_G_DRAW_START)) {
+        Gun_Pistols_UndrawMeshLeft(weapon_type);
+        anil--;
     } else if (Anim_TestAbsFrameRange(anil, LF_G_UNDRAW_BEND, LF_G_DRAW_END)) {
         anil--;
-        if (Anim_TestAbsFrameEqual(anil, LF_G_DRAW_START)) {
-            Gun_Pistols_UndrawMeshLeft(weapon_type);
-        }
     }
     g_Lara.left_arm.frame_number = anil;
 
@@ -64,11 +64,11 @@ void Gun_Pistols_Undraw(const LARA_GUN_TYPE weapon_type)
         g_Lara.right_arm.rot.y = 0;
         g_Lara.right_arm.rot.z = 0;
         anir = LF_G_DRAW_END;
+    } else if (Anim_TestAbsFrameEqual(anir, LF_G_DRAW_START)) {
+        Gun_Pistols_UndrawMeshRight(weapon_type);
+        anir--;
     } else if (Anim_TestAbsFrameRange(anir, LF_G_UNDRAW_BEND, LF_G_DRAW_END)) {
         anir--;
-        if (Anim_TestAbsFrameEqual(anir, LF_G_DRAW_START)) {
-            Gun_Pistols_UndrawMeshRight(weapon_type);
-        }
     }
     g_Lara.right_arm.frame_number = anir;