mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-21 06:09:42 +00:00
Merge branch 'Slidy-creep' into 'master'
Update idle state when anim queue is not empty. See merge request OpenMW/openmw!3602
This commit is contained in:
commit
152a5aafdb
1 changed files with 9 additions and 10 deletions
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue