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

Fast-forward death animation to end if death animation was finished earlier (regression #4468)

Browse source
This commit is contained in:
Andrei Kortunov 2018-06-20 12:37:58 +04:00
parent f3923a41c0
commit c9756cee4c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2026,10 +2026,11 @@ void CharacterController::update(float duration)
{ {
// initial start of death animation for actors that started the game as dead // initial start of death animation for actors that started the game as dead
// not done in constructor since we need to give scripts a chance to set the mSkipAnim flag // not done in constructor since we need to give scripts a chance to set the mSkipAnim flag
if (!mSkipAnim && mDeathState != CharState_None && mCurrentDeath.empty() && cls.isPersistent(mPtr)) if (!mSkipAnim && mDeathState != CharState_None && mCurrentDeath.empty())
{ {
// Fast-forward death animation to end for persisting corpses // Fast-forward death animation to end for persisting corpses or corpses after end of death animation
playDeath(1.f, mDeathState); if (cls.isPersistent(mPtr) || cls.getCreatureStats(mPtr).isDeathAnimationFinished())
playDeath(1.f, mDeathState);
} }
// We must always queue movement, even if there is none, to apply gravity. // We must always queue movement, even if there is none, to apply gravity.
world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f)); world->queueMovement(mPtr, osg::Vec3f(0.f, 0.f, 0.f));