mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-01 04:20:20 +00:00
Code Issues Projects Releases Wiki Activity

For hit state, cancel non-biped idle if there is an active animation

Browse Source
This commit is contained in:
Alexei Kotov 2023-01-07 22:35:29 +03:00
parent 152bdb2f65
commit fa7991fcb3
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

@ -752,7 +752,7 @@ namespace MWMechanics
// FIXME: if one of the below states is close to their last animation frame (i.e. will be disabled in the coming // FIXME: if one of the below states is close to their last animation frame (i.e. will be disabled in the coming
// update), the idle animation should be displayed // update), the idle animation should be displayed
if (((mUpperBodyState != UpperBodyState::None && mUpperBodyState != UpperBodyState::WeaponEquipped) if (((mUpperBodyState != UpperBodyState::None && mUpperBodyState != UpperBodyState::WeaponEquipped)
|| mMovementState != CharState_None || mHitState != CharState_None) || mMovementState != CharState_None || !mCurrentHit.empty())
&& !mPtr.getClass().isBipedal(mPtr)) && !mPtr.getClass().isBipedal(mPtr))
{ {
resetCurrentIdleState(); resetCurrentIdleState();