|
|
|
@ -415,11 +415,13 @@ void CharacterController::refreshJumpAnims(const WeaponInfo* weap, JumpingState
|
|
|
|
|
|
|
|
|
|
void CharacterController::refreshMovementAnims(const WeaponInfo* weap, CharacterState movement, CharacterState& idle, bool force)
|
|
|
|
|
{
|
|
|
|
|
if (movement == mMovementState && idle == mIdleState && !force)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
std::string movementAnimName;
|
|
|
|
|
MWRender::Animation::BlendMask movemask;
|
|
|
|
|
const StateInfo *movestate;
|
|
|
|
|
if(force || movement != mMovementState || idle != mIdleState)
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
movemask = MWRender::Animation::BlendMask_All;
|
|
|
|
|
movestate = std::find_if(sMovementList, sMovementListEnd, FindCharState(movement));
|
|
|
|
|
if(movestate != sMovementListEnd)
|
|
|
|
@ -448,7 +450,6 @@ void CharacterController::refreshMovementAnims(const WeaponInfo* weap, Character
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(force || movement != mMovementState)
|
|
|
|
|
{
|
|
|
|
|