mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 10:09:39 +00:00
Code Issues Releases Wiki Activity

Fix an always true condition (Bug #1355)

Browse source
This commit is contained in:
scrawl 2014-06-07 18:00:39 +02:00
parent a0bff03560
commit 69855097ca
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/openmw/mwmechanics/character.cpp
View file

@ -977,7 +977,8 @@ bool CharacterController::updateWeaponState()
} }
//if playing combat animation and lowerbody is not busy switch to whole body animation //if playing combat animation and lowerbody is not busy switch to whole body animation
if((weaptype != WeapType_None || UpperCharState_UnEquipingWeap) && animPlaying) if((weaptype != WeapType_None || mUpperBodyState == UpperCharState_UnEquipingWeap
|| mUpperBodyState == UpperCharState_EquipingWeap) && animPlaying)
{ {
if( mMovementState != CharState_None || if( mMovementState != CharState_None ||
mJumpState != JumpState_None || mJumpState != JumpState_None ||