mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-02 10:15:33 +00:00
Code Issues Releases Wiki Activity

Do not interrupt scripted animations by death animation (bug #4286)

Browse source
This commit is contained in:
Andrei Kortunov 2018-06-11 18:53:25 +04:00
parent d0619cfb35
commit a42c663fd7
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -728,6 +728,14 @@ void CharacterController::playRandomDeath(float startpoint)
MWBase::Environment::get().getWorld()->useDeathCamera(); MWBase::Environment::get().getWorld()->useDeathCamera();
} }
// Do not interrupt scripted animation by death
if (!mAnimQueue.empty())
{
AnimationQueueEntry& first = mAnimQueue.front();
if (first.mPersist && isAnimPlaying(first.mGroup))
return;
}
if(mHitState == CharState_SwimKnockDown && mAnimation->hasAnimation("swimdeathknockdown")) if(mHitState == CharState_SwimKnockDown && mAnimation->hasAnimation("swimdeathknockdown"))
{ {
mDeathState = CharState_SwimDeathKnockDown; mDeathState = CharState_SwimDeathKnockDown;