From a42c663fd70b0b44289fe7a00481d517204133d5 Mon Sep 17 00:00:00 2001
From: Andrei Kortunov <andrei.kortunov@yandex.ru>
Date: Mon, 11 Jun 2018 18:53:25 +0400
Subject: [PATCH] Do not interrupt scripted animations by death animation (bug
 #4286)

---
 apps/openmw/mwmechanics/character.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index daab8cdeb1..d0ffe742ae 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -728,6 +728,14 @@ void CharacterController::playRandomDeath(float startpoint)
         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"))
     {
         mDeathState = CharState_SwimDeathKnockDown;