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

Accept a ConstPtr in isEssential

Browse source
This commit is contained in:
scrawl 2015-12-18 16:39:35 +01:00
parent 4a47fc32fa
commit 3fe3091275
6 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -448,7 +448,7 @@ namespace MWClass
return ref->mBase->mScript; return ref->mBase->mScript;
} }
bool Creature::isEssential (const MWWorld::Ptr& ptr) const bool Creature::isEssential (const MWWorld::ConstPtr& ptr) const
{ {
return isFlagBitSet(ptr, ESM::Creature::Essential); return isFlagBitSet(ptr, ESM::Creature::Essential);
} }

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

@ -83,7 +83,7 @@ namespace MWClass
virtual float getArmorRating (const MWWorld::Ptr& ptr) const; virtual float getArmorRating (const MWWorld::Ptr& ptr) const;
///< @return combined armor rating of this actor ///< @return combined armor rating of this actor
virtual bool isEssential (const MWWorld::Ptr& ptr) const; virtual bool isEssential (const MWWorld::ConstPtr& ptr) const;
///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable) ///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
virtual int getServices (const MWWorld::Ptr& actor) const; virtual int getServices (const MWWorld::Ptr& actor) const;

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

@ -908,10 +908,9 @@ namespace MWClass
return ptr.getRefData().getCustomData()->asNpcCustomData().mMovement; return ptr.getRefData().getCustomData()->asNpcCustomData().mMovement;
} }
bool Npc::isEssential (const MWWorld::Ptr& ptr) const bool Npc::isEssential (const MWWorld::ConstPtr& ptr) const
{ {
MWWorld::LiveCellRef<ESM::NPC> *ref = const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
ptr.get<ESM::NPC>();
return (ref->mBase->mFlags & ESM::NPC::Essential) != 0; return (ref->mBase->mFlags & ESM::NPC::Essential) != 0;
} }

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

@ -114,7 +114,7 @@ namespace MWClass
virtual void skillUsageSucceeded (const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor=1.f) const; virtual void skillUsageSucceeded (const MWWorld::Ptr& ptr, int skill, int usageType, float extraFactor=1.f) const;
///< Inform actor \a ptr that a skill use has succeeded. ///< Inform actor \a ptr that a skill use has succeeded.
virtual bool isEssential (const MWWorld::Ptr& ptr) const; virtual bool isEssential (const MWWorld::ConstPtr& ptr) const;
///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable) ///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
virtual int getServices (const MWWorld::Ptr& actor) const; virtual int getServices (const MWWorld::Ptr& actor) const;

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

@ -218,7 +218,7 @@ namespace MWWorld
throw std::runtime_error ("encumbrance not supported by class"); throw std::runtime_error ("encumbrance not supported by class");
} }
bool Class::isEssential (const MWWorld::Ptr& ptr) const bool Class::isEssential (const MWWorld::ConstPtr& ptr) const
{ {
return false; return false;
} }

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

@ -229,7 +229,7 @@ namespace MWWorld
/// ///
/// (default implementations: throws an exception) /// (default implementations: throws an exception)
virtual bool isEssential (const MWWorld::Ptr& ptr) const; virtual bool isEssential (const MWWorld::ConstPtr& ptr) const;
///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable) ///< Is \a ptr essential? (i.e. may losing \a ptr make the game unwinnable)
/// ///
/// (default implementation: return false) /// (default implementation: return false)