mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-22 20:53:53 +00:00
Code Issues Releases Wiki Activity

Play death animation for non-persisting actors with 0 health (bug #4291)

Browse source
This commit is contained in:
Andrei Kortunov 2018-06-11 18:52:20 +04:00
parent 6099735c60
commit d0619cfb35
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2023,7 +2023,11 @@ void CharacterController::update(float duration)
// 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()) if (!mSkipAnim && mDeathState != CharState_None && mCurrentDeath.empty())
{ {
playDeath(1.f, mDeathState); // Fast-forward death animation to end for persisting corpses
if (cls.isPersistent(mPtr))
playDeath(1.f, mDeathState);
else
playDeath(0.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));
@ -2239,6 +2243,7 @@ void CharacterController::forceStateUpdate()
clearAnimQueue(); clearAnimQueue();
refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true); refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true);
if(mDeathState != CharState_None) if(mDeathState != CharState_None)
{ {
playRandomDeath(); playRandomDeath();