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

Accept a ConstPtr in getBaseGold

Browse source
This commit is contained in:
scrawl 2015-12-18 16:28:20 +01:00
parent da7ebfde99
commit 5b082be79f
6 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -735,7 +735,7 @@ namespace MWClass
customData.mCreatureStats.writeState (state2.mCreatureStats); customData.mCreatureStats.writeState (state2.mCreatureStats);
} }
int Creature::getBaseGold(const MWWorld::Ptr& ptr) const int Creature::getBaseGold(const MWWorld::ConstPtr& ptr) const
{ {
return ptr.get<ESM::Creature>()->mBase->mData.mGold; return ptr.get<ESM::Creature>()->mBase->mData.mGold;
} }

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

@ -122,7 +122,7 @@ namespace MWClass
virtual void writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const; virtual void writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const;
///< Write additional state from \a ptr into \a state. ///< Write additional state from \a ptr into \a state.
virtual int getBaseGold(const MWWorld::Ptr& ptr) const; virtual int getBaseGold(const MWWorld::ConstPtr& ptr) const;
virtual void respawn (const MWWorld::Ptr& ptr) const; virtual void respawn (const MWWorld::Ptr& ptr) const;

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

@ -1192,9 +1192,9 @@ namespace MWClass
static_cast<const MWMechanics::CreatureStats&> (customData.mNpcStats).writeState (state2.mCreatureStats); static_cast<const MWMechanics::CreatureStats&> (customData.mNpcStats).writeState (state2.mCreatureStats);
} }
int Npc::getBaseGold(const MWWorld::Ptr& ptr) const int Npc::getBaseGold(const MWWorld::ConstPtr& ptr) const
{ {
MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>(); const MWWorld::LiveCellRef<ESM::NPC> *ref = ptr.get<ESM::NPC>();
if(ref->mBase->mNpdtType != ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS) if(ref->mBase->mNpdtType != ESM::NPC::NPC_WITH_AUTOCALCULATED_STATS)
return ref->mBase->mNpdt52.mGold; return ref->mBase->mNpdt52.mGold;
else else

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

@ -148,7 +148,7 @@ namespace MWClass
const; const;
///< Write additional state from \a ptr into \a state. ///< Write additional state from \a ptr into \a state.
virtual int getBaseGold(const MWWorld::Ptr& ptr) const; virtual int getBaseGold(const MWWorld::ConstPtr& ptr) const;
virtual bool isClass(const MWWorld::Ptr& ptr, const std::string &className) const; virtual bool isClass(const MWWorld::Ptr& ptr, const std::string &className) const;

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

@ -399,7 +399,7 @@ namespace MWWorld
void Class::writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const {} void Class::writeAdditionalState (const MWWorld::ConstPtr& ptr, ESM::ObjectState& state) const {}
int Class::getBaseGold(const MWWorld::Ptr& ptr) const int Class::getBaseGold(const MWWorld::ConstPtr& ptr) const
{ {
throw std::runtime_error("class does not support base gold"); throw std::runtime_error("class does not support base gold");
} }

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

@ -320,7 +320,7 @@ namespace MWWorld
static void registerClass (const std::string& key, boost::shared_ptr<Class> instance); static void registerClass (const std::string& key, boost::shared_ptr<Class> instance);
virtual int getBaseGold(const MWWorld::Ptr& ptr) const; virtual int getBaseGold(const MWWorld::ConstPtr& ptr) const;
virtual bool isClass(const MWWorld::Ptr& ptr, const std::string &className) const; virtual bool isClass(const MWWorld::Ptr& ptr, const std::string &className) const;