From f596b698d96a07ed4916ee056f2d4a8a00884d43 Mon Sep 17 00:00:00 2001
From: mrcheko <cheko@sevas.ua>
Date: Sun, 4 May 2014 18:15:07 +0400
Subject: [PATCH] fixes to slow-down at jump startup and infinite air intertia
 growth

---
 apps/openmw/mwmechanics/character.cpp | 35 +++++++++++++++------------
 apps/openmw/mwworld/physicssystem.cpp | 11 ++++++++-
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 8ad2b4a67e..42ed235c57 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1006,7 +1006,16 @@ void CharacterController::update(float duration)
         bool flying = world->isFlying(mPtr);
         //Ogre::Vector3 vec = cls.getMovementVector(mPtr);
         Ogre::Vector3 vec(cls.getMovementSettings(mPtr).mPosition);
-        vec.normalise();
+        if(vec.z > 0.0f) // to avoid slow-down when jumping
+        {
+            Ogre::Vector2 vecXY = Ogre::Vector2(vec.x, vec.y);
+            vecXY.normalise();
+            vec.x = vecXY.x;
+            vec.y = vecXY.y;
+        }
+        else 
+            vec.normalise();
+
         if(mHitState != CharState_None && mJumpState == JumpState_None)
             vec = Ogre::Vector3(0.0f);
         Ogre::Vector3 rot = cls.getRotationVector(mPtr);
@@ -1107,9 +1116,12 @@ void CharacterController::update(float duration)
             if(cls.isNpc())
             {
                 const NpcStats &stats = cls.getNpcStats(mPtr);
-                mult = gmst.find("fJumpMoveBase")->getFloat() +
+                static const float fJumpMoveBase = gmst.find("fJumpMoveBase")->getFloat();
+                static const float fJumpMoveMult = gmst.find("fJumpMoveMult")->getFloat();
+
+                mult = fJumpMoveBase +
                        (stats.getSkill(ESM::Skill::Acrobatics).getModified()/100.0f *
-                        gmst.find("fJumpMoveMult")->getFloat());
+                        fJumpMoveMult);
             }
 
             vec.x *= mult;
@@ -1119,14 +1131,7 @@ void CharacterController::update(float duration)
         else if(vec.z > 0.0f && mJumpState == JumpState_None)
         {
             // Started a jump.
-            float z = cls.getJump(mPtr);
-            if(vec.x == 0 && vec.y == 0)
-                vec = Ogre::Vector3(0.0f, 0.0f, z);
-            else
-            {
-                Ogre::Vector3 lat = Ogre::Vector3(vec.x, vec.y, 0.0f).normalisedCopy();
-                vec = Ogre::Vector3(lat.x, lat.y, 1.0f) * z * 0.707f;
-            }
+            vec.z = cls.getJump(mPtr);
 
             // advance acrobatics
             if (mPtr.getRefData().getHandle() == "player")
@@ -1438,14 +1443,14 @@ void CharacterController::updateVisibility()
 
 void CharacterController::determineAttackType()
 {
-    float * move = mPtr.getClass().getMovementSettings(mPtr).mPosition;
+    float *move = mPtr.getClass().getMovementSettings(mPtr).mPosition;
 
     if(mPtr.getClass().hasInventoryStore(mPtr))
     {
-        if (move[0] && !move[1]) //sideway
-            mAttackType = "slash";
-        else if (move[1]) //forward
+        if (move[1]) // forward-backward
             mAttackType = "thrust";
+        else if (move[0]) //sideway
+            mAttackType = "slash";
         else
             mAttackType = "chop";
     }
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 247c0d4bdf..5b85e203c9 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -246,6 +246,15 @@ namespace MWWorld
                     // If falling, add part of the incoming velocity with the current inertia
                     // TODO: but we could be jumping up?
                     velocity = velocity * time + physicActor->getInertialForce();
+
+                    // avoid getting infinite inertia in air
+                    float actorSpeed = ptr.getClass().getSpeed(ptr);
+                    float speedXY = Ogre::Vector2(velocity.x, velocity.y).length();
+                    if (speedXY > actorSpeed) 
+                    {
+                        velocity.x *= actorSpeed / speedXY;
+                        velocity.y *= actorSpeed / speedXY;
+                    }
                 }
                 inertia = velocity; // NOTE: velocity is for z axis only in this code block
 
@@ -314,7 +323,7 @@ namespace MWWorld
                 if(stepMove(colobj, newPosition, velocity, remainingTime, engine))
                 {
                     // don't let pure water creatures move out of water after stepMove
-                    if((ptr.getClass().canSwim(ptr) && !ptr.getClass().canWalk(ptr)) 
+                    if((ptr.getClass().canSwim(ptr) && !canWalk) 
                             && newPosition.z > (waterlevel - halfExtents.z * 0.5))
                         newPosition = oldPosition;
                     else // Only on the ground if there's gravity