From 84a0d064cd71ebb6dedff4f13969efc2bb3a863e Mon Sep 17 00:00:00 2001 From: scrawl Date: Tue, 2 Sep 2014 15:14:23 +0200 Subject: [PATCH] Fall back to regular death animation if deathknockdown/deathknockout don't exist (Fixes #1870) --- apps/openmw/mwmechanics/character.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp index de3714f75..bd3ff5cd5 100644 --- a/apps/openmw/mwmechanics/character.cpp +++ b/apps/openmw/mwmechanics/character.cpp @@ -557,11 +557,11 @@ void CharacterController::playRandomDeath(float startpoint) { mDeathState = CharState_SwimDeath; } - else if (mHitState == CharState_KnockDown) + else if (mHitState == CharState_KnockDown && mAnimation->hasAnimation("deathknockdown")) { mDeathState = CharState_DeathKnockDown; } - else if (mHitState == CharState_KnockOut) + else if (mHitState == CharState_KnockOut && mAnimation->hasAnimation("deathknockout")) { mDeathState = CharState_DeathKnockOut; }