mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-26 18:36:48 +00:00
Code Issues Releases Wiki Activity

Merge branch 'hit_me_with_your_big_club' into 'master'

Browse source 
Allow Rieklings and Goblins to attack again

Closes #6243

See merge request OpenMW/openmw!1174
This commit is contained in:
Alexei Dobrohotov 2021-08-29 00:58:10 +00:00
commit 4f99c060c3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1653,7 +1653,7 @@ 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);
if(mAnimation->isPlaying(mCurrentWeapon)) if(mAnimation->getCurrentTime(mCurrentWeapon) != -1.f)
mUpperBodyState = UpperCharState_StartToMinAttack; mUpperBodyState = UpperCharState_StartToMinAttack;
} }
} }