mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 12:49:40 +00:00
Code Issues Releases Wiki Activity

Accept a ConstPtr in isPersistent

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

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

@ -554,9 +554,9 @@ namespace MWClass
return 0; return 0;
} }
bool Creature::isPersistent(const MWWorld::Ptr &actor) const bool Creature::isPersistent(const MWWorld::ConstPtr &actor) const
{ {
MWWorld::LiveCellRef<ESM::Creature>* ref = actor.get<ESM::Creature>(); const MWWorld::LiveCellRef<ESM::Creature>* ref = actor.get<ESM::Creature>();
return ref->mBase->mPersistent; return ref->mBase->mPersistent;
} }

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

@ -88,7 +88,7 @@ namespace MWClass
virtual int getServices (const MWWorld::Ptr& actor) const; virtual int getServices (const MWWorld::Ptr& actor) const;
virtual bool isPersistent (const MWWorld::Ptr& ptr) const; virtual bool isPersistent (const MWWorld::ConstPtr& ptr) const;
virtual std::string getSoundIdFromSndGen(const MWWorld::Ptr &ptr, const std::string &name) const; virtual std::string getSoundIdFromSndGen(const MWWorld::Ptr &ptr, const std::string &name) const;

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

@ -419,9 +419,9 @@ namespace MWClass
renderingInterface.getObjects().insertNPC(ptr); renderingInterface.getObjects().insertNPC(ptr);
} }
bool Npc::isPersistent(const MWWorld::Ptr &actor) const bool Npc::isPersistent(const MWWorld::ConstPtr &actor) const
{ {
MWWorld::LiveCellRef<ESM::NPC>* ref = actor.get<ESM::NPC>(); const MWWorld::LiveCellRef<ESM::NPC>* ref = actor.get<ESM::NPC>();
return ref->mBase->mPersistent; return ref->mBase->mPersistent;
} }

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

@ -119,7 +119,7 @@ namespace MWClass
virtual int getServices (const MWWorld::Ptr& actor) const; virtual int getServices (const MWWorld::Ptr& actor) const;
virtual bool isPersistent (const MWWorld::Ptr& ptr) const; virtual bool isPersistent (const MWWorld::ConstPtr& ptr) const;
virtual std::string getSoundIdFromSndGen(const MWWorld::Ptr &ptr, const std::string &name) const; virtual std::string getSoundIdFromSndGen(const MWWorld::Ptr &ptr, const std::string &name) const;

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

@ -241,7 +241,7 @@ namespace MWWorld
return *iter->second; return *iter->second;
} }
bool Class::isPersistent(const Ptr &ptr) const bool Class::isPersistent(const ConstPtr &ptr) const
{ {
throw std::runtime_error ("class does not support persistence"); throw std::runtime_error ("class does not support persistence");
} }

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

@ -277,7 +277,7 @@ namespace MWWorld
virtual float getWeight (const MWWorld::ConstPtr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual bool isPersistent (const MWWorld::Ptr& ptr) const; virtual bool isPersistent (const MWWorld::ConstPtr& ptr) const;
virtual bool isKey (const MWWorld::ConstPtr& ptr) const { return false; } virtual bool isKey (const MWWorld::ConstPtr& ptr) const { return false; }