From 152bdb2f65c29fe30ddb348f2e925227df52d772 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 7 Jan 2023 22:16:35 +0300
Subject: [PATCH 1/2] Prevent missing KO animations from cancelling KO

---
 apps/openmw/mwmechanics/character.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 21e30ec8ac..966ed5a158 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -400,6 +400,9 @@ namespace MWMechanics
         {
             if (!mAnimation->isPlaying(mCurrentHit))
             {
+                if (isKnockedOut() && mCurrentHit.empty() && knockout)
+                    return;
+
                 mHitState = CharState_None;
                 mCurrentHit.clear();
                 stats.setKnockedDown(false);
@@ -450,18 +453,6 @@ namespace MWMechanics
                 mCurrentHit = chooseRandomGroup(hitStateToAnimGroup(CharState_Hit));
         }
 
-        if (!mAnimation->hasAnimation(mCurrentHit))
-        {
-            // The hit animation is missing. Reset the current hit state and immediately cancel all states as if the
-            // animation were instantaneous.
-            mHitState = CharState_None;
-            mCurrentHit.clear();
-            stats.setKnockedDown(false);
-            stats.setHitRecovery(false);
-            resetCurrentIdleState();
-            return;
-        }
-
         // Cancel upper body animations
         if (isKnockedOut() || isKnockedDown())
         {
@@ -479,6 +470,12 @@ namespace MWMechanics
             }
         }
 
+        if (!mAnimation->hasAnimation(mCurrentHit))
+        {
+            mCurrentHit.clear();
+            return;
+        }
+
         mAnimation->play(
             mCurrentHit, priority, MWRender::Animation::BlendMask_All, true, 1, startKey, stopKey, 0.0f, ~0ul);
     }

From fa7991fcb3bfbf73f3adcb5465cf23adb6cd0020 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Sat, 7 Jan 2023 22:35:29 +0300
Subject: [PATCH 2/2] For hit state, cancel non-biped idle if there is an
 active animation

---
 apps/openmw/mwmechanics/character.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 966ed5a158..9999cfc3c6 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -752,7 +752,7 @@ namespace MWMechanics
         // FIXME: if one of the below states is close to their last animation frame (i.e. will be disabled in the coming
         // update), the idle animation should be displayed
         if (((mUpperBodyState != UpperBodyState::None && mUpperBodyState != UpperBodyState::WeaponEquipped)
-                || mMovementState != CharState_None || mHitState != CharState_None)
+                || mMovementState != CharState_None || !mCurrentHit.empty())
             && !mPtr.getClass().isBipedal(mPtr))
         {
             resetCurrentIdleState();