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

Accept a ConstPtr in getEnchantment

Browse source
This commit is contained in:
scrawl 2015-12-18 15:56:45 +01:00
parent beb8805a12
commit 2bc851c7d3
10 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -258,10 +258,9 @@ namespace MWClass
return info;
}
std::string Armor::getEnchantment (const MWWorld::Ptr& ptr) const
std::string Armor::getEnchantment (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Armor> *ref =
ptr.get<ESM::Armor>();
const MWWorld::LiveCellRef<ESM::Armor> *ref = ptr.get<ESM::Armor>();
return ref->mBase->mEnchant;
}

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

@ -67,7 +67,7 @@ namespace MWClass
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;
virtual std::string getEnchantment (const MWWorld::ConstPtr& ptr) const;
///< @return the enchantment ID if the object is enchanted, otherwise an empty string
virtual std::string applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;

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

@ -146,10 +146,9 @@ namespace MWClass
return info;
}
std::string Book::getEnchantment (const MWWorld::Ptr& ptr) const
std::string Book::getEnchantment (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Book> *ref =
ptr.get<ESM::Book>();
const MWWorld::LiveCellRef<ESM::Book> *ref = ptr.get<ESM::Book>();
return ref->mBase->mEnchant;
}

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

@ -51,7 +51,7 @@ namespace MWClass
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;
virtual std::string getEnchantment (const MWWorld::ConstPtr& ptr) const;
///< @return the enchantment ID if the object is enchanted, otherwise an empty string
virtual std::string applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;

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

@ -200,10 +200,9 @@ namespace MWClass
return info;
}
std::string Clothing::getEnchantment (const MWWorld::Ptr& ptr) const
std::string Clothing::getEnchantment (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Clothing> *ref =
ptr.get<ESM::Clothing>();
const MWWorld::LiveCellRef<ESM::Clothing> *ref = ptr.get<ESM::Clothing>();
return ref->mBase->mEnchant;
}

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

@ -59,7 +59,7 @@ namespace MWClass
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;
virtual std::string getEnchantment (const MWWorld::ConstPtr& ptr) const;
///< @return the enchantment ID if the object is enchanted, otherwise an empty string
virtual std::string applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;

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

@ -347,10 +347,9 @@ namespace MWClass
return info;
}
std::string Weapon::getEnchantment (const MWWorld::Ptr& ptr) const
std::string Weapon::getEnchantment (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Weapon> *ref =
ptr.get<ESM::Weapon>();
const MWWorld::LiveCellRef<ESM::Weapon> *ref = ptr.get<ESM::Weapon>();
return ref->mBase->mEnchant;
}

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

@ -65,7 +65,7 @@ namespace MWClass
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;
virtual std::string getEnchantment (const MWWorld::ConstPtr& ptr) const;
///< @return the enchantment ID if the object is enchanted, otherwise an empty string
virtual std::string applyEnchantment(const MWWorld::Ptr &ptr, const std::string& enchId, int enchCharge, const std::string& newName) const;

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

@ -282,7 +282,7 @@ namespace MWWorld
return false;
}
std::string Class::getEnchantment (const Ptr& ptr) const
std::string Class::getEnchantment (const ConstPtr& ptr) const
{
return "";
}

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

@ -251,7 +251,7 @@ namespace MWWorld
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;
virtual std::string getEnchantment (const MWWorld::ConstPtr& ptr) const;
///< @return the enchantment ID if the object is enchanted, otherwise an empty string
/// (default implementation: return empty string)