Play death scream only once

apps/openmw/mwmechanics/character.cpp

@@ -728,14 +728,6 @@ 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;
@@ -760,6 +752,15 @@ void CharacterController::playRandomDeath(float startpoint)
     {
         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);
 }