Merge branch 'pushthefatman' into 'master'

Animation regression fixes See merge request OpenMW/openmw!4001
OpenMW · Apr 12, 2024 · bdbbe34 · bdbbe34
2 parents 2f9e071 + dfdd7aa
commit bdbbe34
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
@@ -2479,9 +2479,7 @@ namespace MWMechanics
 
             movement.x() *= scale;
             movement.y() *= scale;
-            // Update movement
-            if (movement != osg::Vec3f())
-                world->queueMovement(mPtr, movement);
+            world->queueMovement(mPtr, movement);
         }
 
         mSkipAnim = false;
@@ -2698,6 +2696,9 @@ namespace MWMechanics
 
     bool CharacterController::isMovementAnimationControlled() const
     {
+        if (mHitState != CharState_None)
+            return true;
+
         if (Settings::game().mPlayerMovementIgnoresAnimation && mPtr == getPlayer())
             return false;