From b09bdd6af58a44f767570b22892454c26de10a26 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Fri, 18 Dec 2015 16:15:40 +0100
Subject: [PATCH] Accept a ConstPtr in isBipedal

---
 apps/openmw/mwclass/creature.cpp |  4 ++--
 apps/openmw/mwclass/creature.hpp |  2 +-
 apps/openmw/mwclass/npc.cpp      | 12 +++++++++++-
 apps/openmw/mwclass/npc.hpp      | 10 +++-------
 apps/openmw/mwworld/class.cpp    |  2 +-
 apps/openmw/mwworld/class.hpp    |  2 +-
 6 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp
index 80042fa52..35b3c4546 100644
--- a/apps/openmw/mwclass/creature.cpp
+++ b/apps/openmw/mwclass/creature.cpp
@@ -40,7 +40,7 @@
 
 namespace
 {
-    bool isFlagBitSet(const MWWorld::Ptr &ptr, ESM::Creature::Flags bitMask)
+    bool isFlagBitSet(const MWWorld::ConstPtr &ptr, ESM::Creature::Flags bitMask)
     {
         return (ptr.get<ESM::Creature>()->mBase->mFlags & bitMask) != 0;
     }
@@ -599,7 +599,7 @@ namespace MWClass
         return MWWorld::Ptr(cell.insert(ref), &cell);
     }
 
-    bool Creature::isBipedal(const MWWorld::Ptr &ptr) const
+    bool Creature::isBipedal(const MWWorld::ConstPtr &ptr) const
     {
         return isFlagBitSet(ptr, ESM::Creature::Bipedal);
     }
diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp
index 66e9207a0..fb303278f 100644
--- a/apps/openmw/mwclass/creature.hpp
+++ b/apps/openmw/mwclass/creature.hpp
@@ -107,7 +107,7 @@ namespace MWClass
                 return true;
             }
 
-            virtual bool isBipedal (const MWWorld::Ptr &ptr) const;
+            virtual bool isBipedal (const MWWorld::ConstPtr &ptr) const;
             virtual bool canFly (const MWWorld::Ptr &ptr) const;
             virtual bool canSwim (const MWWorld::Ptr &ptr) const;
             virtual bool canWalk (const MWWorld::Ptr &ptr) const;
diff --git a/apps/openmw/mwclass/npc.cpp b/apps/openmw/mwclass/npc.cpp
index 1fa8d27a2..8ef3c219a 100644
--- a/apps/openmw/mwclass/npc.cpp
+++ b/apps/openmw/mwclass/npc.cpp
@@ -1208,6 +1208,16 @@ namespace MWClass
         return Misc::StringUtils::ciEqual(ptr.get<ESM::NPC>()->mBase->mClass, className);
     }
 
+    bool Npc::canSwim(const MWWorld::ConstPtr &ptr) const
+    {
+        return true;
+    }
+
+    bool Npc::canWalk(const MWWorld::ConstPtr &ptr) const
+    {
+        return true;
+    }
+
     void Npc::respawn(const MWWorld::Ptr &ptr) const
     {
         if (ptr.get<ESM::NPC>()->mBase->mFlags & ESM::NPC::Respawn)
@@ -1242,7 +1252,7 @@ namespace MWClass
         return ref->mBase->mAiData.mFight;
     }
 
-    bool Npc::isBipedal(const MWWorld::Ptr &ptr) const
+    bool Npc::isBipedal(const MWWorld::ConstPtr &ptr) const
     {
         return true;
     }
diff --git a/apps/openmw/mwclass/npc.hpp b/apps/openmw/mwclass/npc.hpp
index 1d554ed3c..acde83c5f 100644
--- a/apps/openmw/mwclass/npc.hpp
+++ b/apps/openmw/mwclass/npc.hpp
@@ -153,15 +153,11 @@ namespace MWClass
 
             virtual bool isClass(const MWWorld::Ptr& ptr, const std::string &className) const;
 
-            virtual bool canSwim (const MWWorld::Ptr &ptr) const {
-                return true;
-            }
+            virtual bool canSwim (const MWWorld::ConstPtr &ptr) const;
 
-            virtual bool canWalk (const MWWorld::Ptr &ptr) const {
-                return true;
-            }
+            virtual bool canWalk (const MWWorld::ConstPtr &ptr) const;
 
-            virtual bool isBipedal (const MWWorld::Ptr &ptr) const;
+            virtual bool isBipedal (const MWWorld::ConstPtr &ptr) const;
 
             virtual void respawn (const MWWorld::Ptr& ptr) const;
 
diff --git a/apps/openmw/mwworld/class.cpp b/apps/openmw/mwworld/class.cpp
index a481afeb0..681b72c5b 100644
--- a/apps/openmw/mwworld/class.cpp
+++ b/apps/openmw/mwworld/class.cpp
@@ -355,7 +355,7 @@ namespace MWWorld
         return newPtr;
     }
 
-    bool Class::isBipedal(const Ptr &ptr) const
+    bool Class::isBipedal(const ConstPtr &ptr) const
     {
         return false;
     }
diff --git a/apps/openmw/mwworld/class.hpp b/apps/openmw/mwworld/class.hpp
index 6603ecf4b..cc84f9b32 100644
--- a/apps/openmw/mwworld/class.hpp
+++ b/apps/openmw/mwworld/class.hpp
@@ -300,7 +300,7 @@ namespace MWWorld
                 return false;
             }
 
-            virtual bool isBipedal(const MWWorld::Ptr& ptr) const;
+            virtual bool isBipedal(const MWWorld::ConstPtr& ptr) const;
             virtual bool canFly(const MWWorld::Ptr& ptr) const;
             virtual bool canSwim(const MWWorld::Ptr& ptr) const;
             virtual bool canWalk(const MWWorld::Ptr& ptr) const;