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

Accept a ConstPtr in getWeight

Browse source
This commit is contained in:
scrawl 2015-12-18 16:00:50 +01:00
parent 0047a2d330
commit e0bb284804
26 changed files with 38 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -149,10 +149,9 @@ namespace MWClass
return (npcServices & ESM::NPC::Apparatus) != 0; return (npcServices & ESM::NPC::Apparatus) != 0;
} }
float Apparatus::getWeight(const MWWorld::Ptr &ptr) const float Apparatus::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Apparatus> *ref = const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
ptr.get<ESM::Apparatus>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }
} }

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

@ -16,7 +16,7 @@ namespace MWClass
/// Return ID of \a ptr /// Return ID of \a ptr
virtual std::string getId (const MWWorld::Ptr& ptr) const; virtual std::string getId (const MWWorld::Ptr& ptr) const;
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const; virtual void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const;
///< Add reference into a cell for rendering ///< Add reference into a cell for rendering

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

@ -388,10 +388,9 @@ namespace MWClass
|| ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty()); || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
} }
float Armor::getWeight(const MWWorld::Ptr &ptr) const float Armor::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Armor> *ref = const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
ptr.get<ESM::Armor>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }
} }

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

@ -15,7 +15,7 @@ namespace MWClass
/// Return ID of \a ptr /// Return ID of \a ptr
virtual std::string getId (const MWWorld::Ptr& ptr) const; virtual std::string getId (const MWWorld::Ptr& ptr) const;
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const; virtual void insertObjectRendering (const MWWorld::Ptr& ptr, const std::string& model, MWRender::RenderingInterface& renderingInterface) const;
///< Add reference into a cell for rendering ///< Add reference into a cell for rendering

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

@ -196,10 +196,9 @@ namespace MWClass
|| ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty()); || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
} }
float Book::getWeight(const MWWorld::Ptr &ptr) const float Book::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Book> *ref = const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
ptr.get<ESM::Book>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }
} }

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

@ -64,7 +64,7 @@ namespace MWClass
virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const; virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const; virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
}; };

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

@ -284,10 +284,9 @@ namespace MWClass
|| ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty()); || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
} }
float Clothing::getWeight(const MWWorld::Ptr &ptr) const float Clothing::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Clothing> *ref = const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
ptr.get<ESM::Clothing>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }
} }

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

@ -77,7 +77,7 @@ namespace MWClass
virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const; virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const; virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
}; };

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

@ -187,10 +187,9 @@ namespace MWClass
} }
float Ingredient::getWeight(const MWWorld::Ptr &ptr) const float Ingredient::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Ingredient> *ref = const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
ptr.get<ESM::Ingredient>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }
} }

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

@ -57,7 +57,7 @@ namespace MWClass
virtual std::string getModel(const MWWorld::ConstPtr &ptr) const; virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const; virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
}; };

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

@ -218,10 +218,9 @@ namespace MWClass
return (npcServices & ESM::NPC::Lights) != 0; return (npcServices & ESM::NPC::Lights) != 0;
} }
float Light::getWeight(const MWWorld::Ptr &ptr) const float Light::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Light> *ref = const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
ptr.get<ESM::Light>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }

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

@ -67,7 +67,7 @@ namespace MWClass
virtual std::string getModel(const MWWorld::ConstPtr &ptr) const; virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const; virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;

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

@ -174,10 +174,9 @@ namespace MWClass
return ref->mBase->mData.mUses; return ref->mBase->mData.mUses;
} }
float Lockpick::getWeight(const MWWorld::Ptr &ptr) const float Lockpick::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Lockpick> *ref = const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
ptr.get<ESM::Lockpick>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }
} }

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

@ -63,7 +63,7 @@ namespace MWClass
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const; virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual int getItemMaxHealth (const MWWorld::ConstPtr& ptr) const; virtual int getItemMaxHealth (const MWWorld::ConstPtr& ptr) const;
///< Return item max health or throw an exception, if class does not have item health ///< Return item max health or throw an exception, if class does not have item health

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

@ -235,10 +235,9 @@ namespace MWClass
return !ref->mBase->mData.mIsKey && (npcServices & ESM::NPC::Misc) && !isGold(item); return !ref->mBase->mData.mIsKey && (npcServices & ESM::NPC::Misc) && !isGold(item);
} }
float Miscellaneous::getWeight(const MWWorld::Ptr &ptr) const float Miscellaneous::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
ptr.get<ESM::Miscellaneous>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }

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

@ -57,7 +57,7 @@ namespace MWClass
const; const;
///< Generate action for using via inventory menu ///< Generate action for using via inventory menu
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const; virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;

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

@ -180,10 +180,9 @@ namespace MWClass
return (npcServices & ESM::NPC::Potions) != 0; return (npcServices & ESM::NPC::Potions) != 0;
} }
float Potion::getWeight(const MWWorld::Ptr &ptr) const float Potion::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Potion> *ref = const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
ptr.get<ESM::Potion>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }
} }

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

@ -56,7 +56,7 @@ namespace MWClass
virtual std::string getModel(const MWWorld::ConstPtr &ptr) const; virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const; virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
}; };

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

@ -174,10 +174,9 @@ namespace MWClass
return ref->mBase->mData.mUses; return ref->mBase->mData.mUses;
} }
float Probe::getWeight(const MWWorld::Ptr &ptr) const float Probe::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Probe> *ref = const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
ptr.get<ESM::Probe>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }
} }

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

@ -63,7 +63,7 @@ namespace MWClass
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const; virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual int getItemMaxHealth (const MWWorld::ConstPtr& ptr) const; virtual int getItemMaxHealth (const MWWorld::ConstPtr& ptr) const;
///< Return item max health or throw an exception, if class does not have item health ///< Return item max health or throw an exception, if class does not have item health

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

@ -166,10 +166,9 @@ namespace MWClass
return (npcServices & ESM::NPC::RepairItem) != 0; return (npcServices & ESM::NPC::RepairItem) != 0;
} }
float Repair::getWeight(const MWWorld::Ptr &ptr) const float Repair::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Repair> *ref = const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
ptr.get<ESM::Repair>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }
} }

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

@ -65,7 +65,7 @@ namespace MWClass
///< Return item max health or throw an exception, if class does not have item health ///< Return item max health or throw an exception, if class does not have item health
/// (default implementation: throw an exception) /// (default implementation: throw an exception)
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const; virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
}; };

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

@ -425,10 +425,9 @@ namespace MWClass
|| ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty()); || ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());
} }
float Weapon::getWeight(const MWWorld::Ptr &ptr) const float Weapon::getWeight(const MWWorld::ConstPtr &ptr) const
{ {
MWWorld::LiveCellRef<ESM::Weapon> *ref = const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
ptr.get<ESM::Weapon>();
return ref->mBase->mData.mWeight; return ref->mBase->mData.mWeight;
} }
} }

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

@ -83,7 +83,7 @@ namespace MWClass
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const; virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const; virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
}; };

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

@ -208,7 +208,7 @@ namespace MWWorld
throw std::runtime_error ("capacity not supported by this class"); throw std::runtime_error ("capacity not supported by this class");
} }
float Class::getWeight(const Ptr &ptr) const float Class::getWeight(const ConstPtr &ptr) const
{ {
throw std::runtime_error ("weight not supported by this class"); throw std::runtime_error ("weight not supported by this class");
} }

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

@ -275,7 +275,7 @@ namespace MWWorld
///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that. ///< Return 0 if player cannot equip item. 1 if can equip. 2 if it's twohanded weapon. 3 if twohanded weapon conflicts with that.
/// Second item in the pair specifies the error message /// Second item in the pair specifies the error message
virtual float getWeight (const MWWorld::Ptr& ptr) const; virtual float getWeight (const MWWorld::ConstPtr& ptr) const;
virtual bool isPersistent (const MWWorld::Ptr& ptr) const; virtual bool isPersistent (const MWWorld::Ptr& ptr) const;