From ca24a809fc416bc3b5566e4cfd790e3e9c109a67 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Fri, 23 Aug 2013 13:38:26 -0700
Subject: [PATCH] Use the position of the actor to determine if they're
 swimming

---
 apps/openmw/mwworld/physicssystem.cpp | 33 ++++++++++++---------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 761e5111c5..97aa7dffe5 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -107,8 +107,7 @@ namespace MWWorld
         }
 
         static Ogre::Vector3 move(const MWWorld::Ptr &ptr, const Ogre::Vector3 &movement, float time,
-                                  bool isSwimming, bool isFlying, float waterlevel,
-                                  OEngine::Physic::PhysicEngine *engine)
+                                  bool isFlying, float waterlevel, OEngine::Physic::PhysicEngine *engine)
         {
             const ESM::Position &refpos = ptr.getRefData().getPosition();
             Ogre::Vector3 position(refpos.pos);
@@ -135,11 +134,11 @@ namespace MWWorld
             bool isOnGround = false;
             Ogre::Vector3 inertia(0.0f);
             Ogre::Vector3 velocity;
-            if(isSwimming || isFlying)
+            if(position.z < waterlevel || isFlying)
             {
-                velocity = (Ogre::Quaternion(Ogre::Radian( -refpos.rot[2]), Ogre::Vector3::UNIT_Z)*
-                            Ogre::Quaternion(Ogre::Radian( -refpos.rot[1]), Ogre::Vector3::UNIT_Y)*
-                            Ogre::Quaternion(Ogre::Radian(  refpos.rot[0]), Ogre::Vector3::UNIT_X)) *
+                velocity = (Ogre::Quaternion(Ogre::Radian(-refpos.rot[2]), Ogre::Vector3::UNIT_Z)*
+                            Ogre::Quaternion(Ogre::Radian(-refpos.rot[1]), Ogre::Vector3::UNIT_Y)*
+                            Ogre::Quaternion(Ogre::Radian( refpos.rot[0]), Ogre::Vector3::UNIT_X)) *
                            movement;
             }
             else
@@ -173,7 +172,7 @@ namespace MWWorld
             {
                 Ogre::Vector3 nextpos = newPosition + velocity*remainingTime;
 
-                if(isSwimming && !isFlying &&
+                if(newPosition.z < waterlevel && !isFlying &&
                    nextpos.z > waterlevel && newPosition.z <= waterlevel)
                 {
                     const Ogre::Vector3 down(0,0,-1);
@@ -197,7 +196,7 @@ namespace MWWorld
 
                 // We hit something. Try to step up onto it.
                 if(stepMove(colobj, newPosition, velocity, remainingTime, engine))
-                    isOnGround = !(isSwimming || isFlying); // Only on the ground if there's gravity
+                    isOnGround = !(newPosition.z < waterlevel || isFlying); // Only on the ground if there's gravity
                 else
                 {
                     // Can't move this way, try to find another spot along the plane
@@ -208,7 +207,7 @@ namespace MWWorld
 
                     // Do not allow sliding upward if there is gravity. Stepping will have taken
                     // care of that.
-                    if(!(isSwimming || isFlying))
+                    if(!(newPosition.z < waterlevel || isFlying))
                         velocity.z = std::min(velocity.z, 0.0f);
                 }
             }
@@ -225,7 +224,7 @@ namespace MWWorld
                     isOnGround = false;
             }
 
-            if(isOnGround || isSwimming || isFlying)
+            if(isOnGround || newPosition.z < waterlevel || isFlying)
                 physicActor->setInertialForce(Ogre::Vector3(0.0f));
             else
             {
@@ -590,15 +589,13 @@ namespace MWWorld
             for(;iter != mMovementQueue.end();iter++)
             {
                 float waterlevel = -std::numeric_limits<float>::max();
-                const MWWorld::CellStore *cellstore = iter->first.getCell();
-                if(cellstore->mCell->hasWater())
-                    waterlevel = cellstore->mCell->mWater;
+                const ESM::Cell *cell = iter->first.getCell()->mCell;
+                if(cell->hasWater())
+                    waterlevel = cell->mWater;
 
-                Ogre::Vector3 newpos;
-                newpos = MovementSolver::move(iter->first, iter->second, mTimeAccum,
-                                              world->isSwimming(iter->first),
-                                              world->isFlying(iter->first),
-                                              waterlevel, mEngine);
+                Ogre::Vector3 newpos = MovementSolver::move(iter->first, iter->second, mTimeAccum,
+                                                            world->isFlying(iter->first),
+                                                            waterlevel, mEngine);
                 mMovementResults.push_back(std::make_pair(iter->first, newpos));
             }