mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-31 17:45:35 +00:00
Merge branch 'hit_me_with_your_big_club' into 'master'
Allow Rieklings and Goblins to attack again Closes #6243 See merge request OpenMW/openmw!1174
This commit is contained in:
commit
4f99c060c3
1 changed files with 1 additions and 1 deletions
|
@ -1653,7 +1653,7 @@ bool CharacterController::updateWeaponState(CharacterState& idle)
|
|||
MWRender::Animation::BlendMask_All, false,
|
||||
weapSpeed, startKey, stopKey,
|
||||
0.0f, 0);
|
||||
if(mAnimation->isPlaying(mCurrentWeapon))
|
||||
if(mAnimation->getCurrentTime(mCurrentWeapon) != -1.f)
|
||||
mUpperBodyState = UpperCharState_StartToMinAttack;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue