diff --git a/apps/openmw/mwclass/creature.cpp b/apps/openmw/mwclass/creature.cpp index 80934f8858..450889eb2a 100644 --- a/apps/openmw/mwclass/creature.cpp +++ b/apps/openmw/mwclass/creature.cpp @@ -58,6 +58,11 @@ namespace cloned->mContainerStore = mContainerStore->clone(); return cloned; } + + bool isFlagBitSet(const MWWorld::Ptr &ptr, ESM::Creature::Flags bitMask) + { + return (ptr.get()->mBase->mFlags & bitMask) != 0; + } } namespace MWClass @@ -774,10 +779,4 @@ namespace MWClass MWWorld::LiveCellRef *ref = ptr.get(); scale *= ref->mBase->mScale; } - - bool Creature::isFlagBitSet(const MWWorld::Ptr &ptr, ESM::Creature::Flags bitMask) const - { - MWWorld::LiveCellRef *ref = ptr.get(); - return (ref->mBase->mFlags & bitMask) != 0; - } } diff --git a/apps/openmw/mwclass/creature.hpp b/apps/openmw/mwclass/creature.hpp index 1a29d03183..c4ea09255e 100644 --- a/apps/openmw/mwclass/creature.hpp +++ b/apps/openmw/mwclass/creature.hpp @@ -1,8 +1,6 @@ #ifndef GAME_MWCLASS_CREATURE_H #define GAME_MWCLASS_CREATURE_H -#include - #include "actor.hpp" namespace ESM @@ -136,11 +134,6 @@ namespace MWClass virtual int getBaseFightRating(const MWWorld::Ptr &ptr) const; virtual void adjustScale(const MWWorld::Ptr& ptr, osg::Vec3f& scale) const; - - private: - - /// \return true if any of the indicated bits in Creature's mFlags is set - bool isFlagBitSet(const MWWorld::Ptr &ptr, ESM::Creature::Flags bitMask) const; }; }