AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-17 16:36:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'seducer_ice_queen' into 'master'

Browse Source 
Prevent a missing weapon animation from partially freezing actors

See merge request OpenMW/openmw!1060
This commit is contained in:
psi29a 2021-07-28 09:06:13 +00:00
commit 292e6f1a9e
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

@ -1661,7 +1661,8 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
MWRender::Animation::BlendMask_All, false, MWRender::Animation::BlendMask_All, false,
weapSpeed, startKey, stopKey, weapSpeed, startKey, stopKey,
0.0f, 0); 0.0f, 0);
mUpperBodyState = UpperCharState_StartToMinAttack; if(mAnimation->isPlaying(mCurrentWeapon))
mUpperBodyState = UpperCharState_StartToMinAttack;
} }
} }