From ee81698089652ae92c78967570a41c4b21bddbbb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 3 Jul 2014 17:40:44 +0200
Subject: [PATCH] Always control movement by animation except for first person
 or in-air

---
 apps/openmw/mwmechanics/character.cpp | 19 ++++++++++++++-----
 apps/openmw/mwmechanics/character.hpp |  2 +-
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 2c5d68ceb..2f33c0591 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -361,9 +361,10 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
          * beginning. */
         int mode = ((movement == mCurrentMovement) ? 2 : 1);
 
+        mMovementAnimationControlled = true;
+
         mAnimation->disable(mCurrentMovement);
         mCurrentMovement = movement;
-        mMovementAnimVelocity = 0.0f;
         if(!mCurrentMovement.empty())
         {
             float vel, speedmult = 1.0f;
@@ -383,16 +384,18 @@ void CharacterController::refreshCurrentAnims(CharacterState idle, CharacterStat
 
             if(mMovementSpeed > 0.0f && (vel=mAnimation->getVelocity(anim)) > 1.0f)
             {
-                mMovementAnimVelocity = vel;
                 speedmult = mMovementSpeed / vel;
             }
             else if (mMovementState == CharState_TurnLeft || mMovementState == CharState_TurnRight)
                 speedmult = 1.f; // TODO: should get a speed mult depending on the current turning speed
             else if (mMovementSpeed > 0.0f)
+            {
                 // The first person anims don't have any velocity to calculate a speed multiplier from.
                 // We use the third person velocities instead.
                 // FIXME: should be pulled from the actual animation, but it is not presently loaded.
                 speedmult = mMovementSpeed / (isrunning ? 222.857f : 154.064f);
+                mMovementAnimationControlled = false;
+            }
             mAnimation->play(mCurrentMovement, Priority_Movement, movegroup, false,
                              speedmult, ((mode!=2)?"start":"loop start"), "stop", 0.0f, ~0ul);
         }
@@ -506,6 +509,7 @@ void CharacterController::playDeath(float startpoint, CharacterState death)
     mJumpState = JumpState_None;
     mAnimation->disable(mCurrentJump);
     mCurrentJump = "";
+    mMovementAnimationControlled = true;
 
     mAnimation->play(mCurrentDeath, Priority_Death, MWRender::Animation::Group_All,
                     false, 1.0f, "start", "stop", startpoint, 0);
@@ -547,7 +551,7 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
     , mIdleState(CharState_None)
     , mMovementState(CharState_None)
     , mMovementSpeed(0.0f)
-    , mMovementAnimVelocity(0.0f)
+    , mMovementAnimationControlled(true)
     , mDeathState(CharState_None)
     , mHitState(CharState_None)
     , mUpperBodyState(UpperCharState_Nothing)
@@ -1241,6 +1245,7 @@ void CharacterController::update(float duration)
         if (inwater || flying)
             cls.getCreatureStats(mPtr).land();
 
+        bool inJump = true;
         if(!onground && !flying && !inwater)
         {
             // In the air (either getting up —ascending part of jump— or falling).
@@ -1330,6 +1335,8 @@ void CharacterController::update(float duration)
                 mJumpState = JumpState_None;
             vec.z = 0.0f;
 
+            inJump = false;
+
             if(std::abs(vec.x/2.0f) > std::abs(vec.y))
             {
                 if(vec.x > 0.0f)
@@ -1391,6 +1398,8 @@ void CharacterController::update(float duration)
             forcestateupdate = updateCreatureState() || forcestateupdate;
 
         refreshCurrentAnims(idlestate, movestate, forcestateupdate);
+        if (inJump)
+            mMovementAnimationControlled = false;
 
         if (!mSkipAnim)
         {
@@ -1402,7 +1411,7 @@ void CharacterController::update(float duration)
             else //avoid z-rotating for knockdown
                 world->rotateObject(mPtr, rot.x, rot.y, 0.0f, true);
 
-            if (mMovementAnimVelocity == 0)
+            if (!mMovementAnimationControlled)
                 world->queueMovement(mPtr, vec);
         }
         else
@@ -1446,7 +1455,7 @@ void CharacterController::update(float duration)
         }
 
         // Update movement
-        if(mMovementAnimVelocity > 0)
+        if(mMovementAnimationControlled && mPtr.getClass().isActor())
             world->queueMovement(mPtr, moved);
     }
     else if (mAnimation)
diff --git a/apps/openmw/mwmechanics/character.hpp b/apps/openmw/mwmechanics/character.hpp
index 59c20db8f..b1e1738bd 100644
--- a/apps/openmw/mwmechanics/character.hpp
+++ b/apps/openmw/mwmechanics/character.hpp
@@ -147,7 +147,7 @@ class CharacterController
     CharacterState mMovementState;
     std::string mCurrentMovement;
     float mMovementSpeed;
-    float mMovementAnimVelocity;
+    bool mMovementAnimationControlled;
 
     CharacterState mDeathState;
     std::string mCurrentDeath;