mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-21 07:39:40 +00:00
Code Issues Releases Wiki Activity

Creature::isFlagBitSet() changed to free function.

Browse source
This commit is contained in:
dteviot 2015-08-28 18:38:05 +12:00
parent 95d2d82abf
commit 300c48329d
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,6 +58,11 @@ namespace
cloned->mContainerStore = mContainerStore->clone(); cloned->mContainerStore = mContainerStore->clone();
return cloned; return cloned;
} }
bool isFlagBitSet(const MWWorld::Ptr &ptr, ESM::Creature::Flags bitMask)
{
return (ptr.get<ESM::Creature>()->mBase->mFlags & bitMask) != 0;
}
} }
namespace MWClass namespace MWClass
@ -774,10 +779,4 @@ namespace MWClass
MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>(); MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
scale *= ref->mBase->mScale; scale *= ref->mBase->mScale;
} }
bool Creature::isFlagBitSet(const MWWorld::Ptr &ptr, ESM::Creature::Flags bitMask) const
{
MWWorld::LiveCellRef<ESM::Creature> *ref = ptr.get<ESM::Creature>();
return (ref->mBase->mFlags & bitMask) != 0;
}
} }

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

@ -1,8 +1,6 @@
#ifndef GAME_MWCLASS_CREATURE_H #ifndef GAME_MWCLASS_CREATURE_H
#define GAME_MWCLASS_CREATURE_H #define GAME_MWCLASS_CREATURE_H
#include <components/esm/loadcrea.hpp>
#include "actor.hpp" #include "actor.hpp"
namespace ESM namespace ESM
@ -136,11 +134,6 @@ namespace MWClass
virtual int getBaseFightRating(const MWWorld::Ptr &ptr) const; virtual int getBaseFightRating(const MWWorld::Ptr &ptr) const;
virtual void adjustScale(const MWWorld::Ptr& ptr, osg::Vec3f& scale) 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;
}; };
} }