From 82121e040172b4d586363e427c09f2df795e443a Mon Sep 17 00:00:00 2001
From: mrcheko <cheko@sevas.ua>
Date: Sun, 27 Apr 2014 16:59:21 +0400
Subject: [PATCH] some checks reworked

---
 apps/openmw/mwclass/npc.hpp           | 8 ++++++++
 apps/openmw/mwmechanics/aicombat.cpp  | 4 ++--
 apps/openmw/mwworld/physicssystem.cpp | 5 +++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 596bf0e56..4b9c8988e 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -170,6 +170,14 @@ namespace MWClass
             virtual int getBaseGold(const MWWorld::Ptr& ptr) const;
 
             virtual bool isClass(const MWWorld::Ptr& ptr, const std::string &className) const;
+
+            virtual bool canSwim (const MWWorld::Ptr &ptr) const {
+                return true;
+            }
+
+            virtual bool canWalk (const MWWorld::Ptr &ptr) const {
+                return true;
+            }
     };
 }
 
diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 2b612d734..42d963117 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -341,8 +341,8 @@ namespace MWMechanics
 
         // check if can move along z-axis
         bool canMoveByZ;
-        if(canMoveByZ = ((actorCls.isNpc() || actorCls.canSwim(actor)) && MWBase::Environment::get().getWorld()->isSwimming(actor))
-            || (actorCls.canFly(actor) && MWBase::Environment::get().getWorld()->isFlying(actor)))
+        if(canMoveByZ = (actorCls.canSwim(actor) && MWBase::Environment::get().getWorld()->isSwimming(actor))
+            || MWBase::Environment::get().getWorld()->isFlying(actor))
         {
             // determine vertical angle to target
             mMovement.mRotation[0] = getXAngleToDir(vDirToTarget, distToTarget);
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 7d531d6d3..5bf8305ba 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -313,8 +313,9 @@ namespace MWWorld
                 // NOTE: stepMove modifies newPosition if successful
                 if(stepMove(colobj, newPosition, velocity, remainingTime, engine))
                 {
-                    // don't let slaughterfish move out of water after stepMove
-                    if(ptr.getClass().canSwim(ptr) && newPosition.z > (waterlevel - halfExtents.z * 0.5))
+                    // don't let pure water creatures move out of water after stepMove
+                    if((ptr.getClass().canSwim(ptr) && !ptr.getClass().canWalk(ptr)) 
+                            && newPosition.z > (waterlevel - halfExtents.z * 0.5))
                         newPosition = oldPosition;
                     else // Only on the ground if there's gravity
                         isOnGround = !(newPosition.z < waterlevel || isFlying);