krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Don't clear idle animation when movement ends (Bug #3581)

Browse source 
This caused problems when AiWander tried to start an idle animation in the frame after movement stops.
This commit is contained in:
scrawl 2017-03-23 19:36:34 +01:00
parent c611ddba8d
commit a5d7b36c28
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -364,9 +364,11 @@ void CharacterController::refreshMovementAnims(const WeaponInfo* weap, Character
{ {
if(force || movement != mMovementState) if(force || movement != mMovementState)
{ {
mIdleState = CharState_None;
mMovementState = movement; mMovementState = movement;
if (movement != CharState_None)
mIdleState = CharState_None;
std::string movementAnimName; std::string movementAnimName;
MWRender::Animation::BlendMask movemask = MWRender::Animation::BlendMask_All; MWRender::Animation::BlendMask movemask = MWRender::Animation::BlendMask_All;
const StateInfo *movestate = std::find_if(sMovementList, sMovementListEnd, FindCharState(mMovementState)); const StateInfo *movestate = std::find_if(sMovementList, sMovementListEnd, FindCharState(mMovementState));