From 0ec3d6a5e1c575f205bb7d882d98f4fffe25de07 Mon Sep 17 00:00:00 2001 From: Wanne Date: Fri, 21 Oct 2011 05:56:02 +0000 Subject: [PATCH] - Animation Bugfix: When merc is standing and equipped with one handed gun (pistol) in first hand slot and 2 handed gun in second hand slot, the animation model was showing 2 pistols (fix by Sandro) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4727 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Tactical/Animation Control.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Tactical/Animation Control.cpp b/Tactical/Animation Control.cpp index 1e3c9951..4aa8768c 100644 --- a/Tactical/Animation Control.cpp +++ b/Tactical/Animation Control.cpp @@ -3788,9 +3788,10 @@ UINT16 DetermineSoldierAnimationSurface( SOLDIERTYPE *pSoldier, UINT16 usAnimSta // Look for good two pistols sub anim..... if ( gDoubleHandledSub.usAnimState == usAnimState ) - { + { // Do we carry two pistols... - if ( Item[ pSoldier->inv[ SECONDHANDPOS ].usItem ].usItemClass == IC_GUN ) + //if ( Item[ pSoldier->inv[ SECONDHANDPOS ].usItem ].usItemClass == IC_GUN ) + if ( pSoldier->IsValidSecondHandShot() ) { usAnimSurface = gDoubleHandledSub.usAnimationSurfaces[ pSoldier->ubBodyType ]; fAdjustedForItem = TRUE;