fix EE-236 #185

stohrendorf · Nov 19, 2021 · 67e371a · 67e371a
1 parent 05352d4
commit 67e371a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/engine/objects/laraobject.cpp b/src/engine/objects/laraobject.cpp
@@ -1057,15 +1057,15 @@ void LaraObject::initWeaponAnimData()
   case WeaponType::Uzis:
     leftArm.weaponAnimData = rightArm.weaponAnimData
       = getWorld().findAnimatedModelForType(TR1ItemId::LaraPistolsAnim)->frames;
-    if(m_handStatus != HandStatus::None)
+    if(m_handStatus != HandStatus::None && m_handStatus != HandStatus::Grabbing)
     {
       overrideLaraMeshesDrawWeapons(getWorld().getPlayer().selectedWeaponType);
     }
     break;
   case WeaponType::Shotgun:
     leftArm.weaponAnimData = rightArm.weaponAnimData
       = getWorld().findAnimatedModelForType(TR1ItemId::LaraShotgunAnim)->frames;
-    if(m_handStatus != HandStatus::None)
+    if(m_handStatus != HandStatus::None && m_handStatus != HandStatus::Grabbing)
     {
       overrideLaraMeshesDrawShotgun();
     }