mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-10 06:44:29 +00:00
Code Issues Projects Releases Wiki Activity

Accept a ConstPtr in getBloodTexture

Browse Source
This commit is contained in:
scrawl 2015-12-18 16:38:14 +01:00
parent 2bd8d60e9f
commit 4a47fc32fa
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

@ -675,7 +675,7 @@ namespace MWClass
} }
} }
int Creature::getBloodTexture(const MWWorld::Ptr &ptr) const int Creature::getBloodTexture(const MWWorld::ConstPtr &ptr) const
{ {
int flags = ptr.get<ESM::Creature>()->mBase->mFlags; int flags = ptr.get<ESM::Creature>()->mBase->mFlags;

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

@ -114,7 +114,7 @@ namespace MWClass
virtual int getSkill(const MWWorld::Ptr &ptr, int skill) const; virtual int getSkill(const MWWorld::Ptr &ptr, int skill) const;
/// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini) /// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini)
virtual int getBloodTexture (const MWWorld::Ptr& ptr) const; virtual int getBloodTexture (const MWWorld::ConstPtr& ptr) const;
virtual void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const; virtual void readAdditionalState (const MWWorld::Ptr& ptr, const ESM::ObjectState& state) const;
///< Read additional state from \a state into \a ptr. ///< Read additional state from \a state into \a ptr.

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

@ -1136,9 +1136,9 @@ namespace MWClass
return ptr.getClass().getNpcStats(ptr).getSkill(skill).getModified(); return ptr.getClass().getNpcStats(ptr).getSkill(skill).getModified();
} }
int Npc::getBloodTexture(const MWWorld::Ptr &ptr) const int Npc::getBloodTexture(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->mFlags & ESM::NPC::Skeleton) if (ref->mBase->mFlags & ESM::NPC::Skeleton)
return 1; return 1;

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

@ -130,7 +130,7 @@ namespace MWClass
virtual int getSkill(const MWWorld::Ptr& ptr, int skill) const; virtual int getSkill(const MWWorld::Ptr& ptr, int skill) const;
/// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini) /// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini)
virtual int getBloodTexture (const MWWorld::Ptr& ptr) const; virtual int getBloodTexture (const MWWorld::ConstPtr& ptr) const;
virtual bool isActor() const { virtual bool isActor() const {
return true; return true;

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

@ -390,7 +390,7 @@ namespace MWWorld
throw std::runtime_error("class does not support skills"); throw std::runtime_error("class does not support skills");
} }
int Class::getBloodTexture (const MWWorld::Ptr& ptr) const int Class::getBloodTexture (const MWWorld::ConstPtr& ptr) const
{ {
throw std::runtime_error("class does not support gore"); throw std::runtime_error("class does not support gore");
} }

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

@ -284,7 +284,7 @@ namespace MWWorld
virtual bool isGold(const MWWorld::ConstPtr& ptr) const { return false; }; virtual bool isGold(const MWWorld::ConstPtr& ptr) const { return false; };
/// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini) /// Get a blood texture suitable for \a ptr (see Blood Texture 0-2 in Morrowind.ini)
virtual int getBloodTexture (const MWWorld::Ptr& ptr) const; virtual int getBloodTexture (const MWWorld::ConstPtr& ptr) const;
virtual Ptr copyToCell(const ConstPtr &ptr, CellStore &cell) const; virtual Ptr copyToCell(const ConstPtr &ptr, CellStore &cell) const;