mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-28 22:06:50 +00:00
Code Issues Releases Wiki Activity

Play death scream only once

Browse source
This commit is contained in:
Andrei Kortunov 2018-06-12 09:55:43 +04:00
parent 0d3f535590
commit ebaa6fb5a2
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -728,14 +728,6 @@ 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;
@ -760,6 +752,15 @@ void CharacterController::playRandomDeath(float startpoint)
{ {
mDeathState = chooseRandomDeathState(); mDeathState = chooseRandomDeathState();
} }
// Do not interrupt scripted animation by death
if (!mAnimQueue.empty())
{
AnimationQueueEntry& first = mAnimQueue.front();
if (first.mPersist && isAnimPlaying(first.mGroup))
return;
}
playDeath(startpoint, mDeathState); playDeath(startpoint, mDeathState);
} }