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

Merge branch 'Slidy-creep' into 'master'

Browse Source 
Update idle state when anim queue is not empty.

See merge request OpenMW/openmw!3602
This commit is contained in:
Alexei Kotov 2023-12-01 20:24:04 +00:00
commit 152a5aafdb
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/openmw/mwmechanics/character.cpp
View File

@ -2306,17 +2306,16 @@ namespace MWMechanics
jumpstate = JumpState_None; jumpstate = JumpState_None;
} }
if (mAnimQueue.empty() || inwater || (sneak && mIdleState != CharState_SpecialIdle)) updateAnimQueue();
{ if (!mAnimQueue.empty())
if (inwater) idlestate = CharState_SpecialIdle;
idlestate = CharState_IdleSwim; else if (sneak && !mInJump)
else if (sneak && !mInJump) idlestate = CharState_IdleSneak;
idlestate = CharState_IdleSneak;
else
idlestate = CharState_Idle;
}
else else
updateAnimQueue(); idlestate = CharState_Idle;
if (inwater)
idlestate = CharState_IdleSwim;
if (!mSkipAnim) if (!mSkipAnim)
{ {