krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Accept a ConstPtr in isBipedal

Browse source
This commit is contained in:
scrawl 2015-12-18 16:15:40 +01:00
parent 92a3acfa56
commit b09bdd6af5
6 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwclass/creature.cpp
View file

@ -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);
}

2
apps/openmw/mwclass/creature.hpp
View file

@ -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;

12
apps/openmw/mwclass/npc.cpp
View file

@ -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;
}

10
apps/openmw/mwclass/npc.hpp
View file

@ -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;

2
apps/openmw/mwworld/class.cpp
View file

@ -355,7 +355,7 @@ namespace MWWorld
return newPtr;
}
bool Class::isBipedal(const Ptr &ptr) const
bool Class::isBipedal(const ConstPtr &ptr) const
{
return false;
}

2
apps/openmw/mwworld/class.hpp
View file

@ -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;