mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-19 15:09:43 +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;
|
||||
}
|
||||
|
||||
if (mAnimQueue.empty() || inwater || (sneak && mIdleState != CharState_SpecialIdle))
|
||||
{
|
||||
if (inwater)
|
||||
idlestate = CharState_IdleSwim;
|
||||
else if (sneak && !mInJump)
|
||||
idlestate = CharState_IdleSneak;
|
||||
else
|
||||
idlestate = CharState_Idle;
|
||||
}
|
||||
updateAnimQueue();
|
||||
if (!mAnimQueue.empty())
|
||||
idlestate = CharState_SpecialIdle;
|
||||
else if (sneak && !mInJump)
|
||||
idlestate = CharState_IdleSneak;
|
||||
else
|
||||
updateAnimQueue();
|
||||
idlestate = CharState_Idle;
|
||||
|
||||
if (inwater)
|
||||
idlestate = CharState_IdleSwim;
|
||||
|
||||
if (!mSkipAnim)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue