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

Accept a ConstPtr in getInventoryIcon

Browse source
This commit is contained in:
scrawl 2015-12-18 15:53:47 +01:00
parent f258c5c508
commit beb8805a12
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

@ -92,10 +92,9 @@ namespace MWClass
return std::string("Item Apparatus Down");
}
std::string Apparatus::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Apparatus::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Apparatus> *ref =
ptr.get<ESM::Apparatus>();
const MWWorld::LiveCellRef<ESM::Apparatus> *ref = ptr.get<ESM::Apparatus>();
return ref->mBase->mIcon;
}

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

@ -51,7 +51,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)

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

@ -199,10 +199,9 @@ namespace MWClass
return std::string("Item Armor Heavy Down");
}
std::string Armor::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Armor::getInventoryIcon (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->mIcon;
}

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

@ -64,7 +64,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;

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

@ -106,10 +106,9 @@ namespace MWClass
return std::string("Item Book Down");
}
std::string Book::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Book::getInventoryIcon (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->mIcon;
}

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

@ -48,7 +48,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;

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

@ -158,10 +158,9 @@ namespace MWClass
return std::string("Item Clothes Down");
}
std::string Clothing::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Clothing::getInventoryIcon (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->mIcon;
}

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

@ -56,7 +56,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;

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

@ -108,10 +108,9 @@ namespace MWClass
return std::string("Item Ingredient Down");
}
std::string Ingredient::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Ingredient::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Ingredient> *ref =
ptr.get<ESM::Ingredient>();
const MWWorld::LiveCellRef<ESM::Ingredient> *ref = ptr.get<ESM::Ingredient>();
return ref->mBase->mIcon;
}

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

@ -52,7 +52,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;

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

@ -138,10 +138,9 @@ namespace MWClass
}
std::string Light::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Light::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Light> *ref =
ptr.get<ESM::Light>();
const MWWorld::LiveCellRef<ESM::Light> *ref = ptr.get<ESM::Light>();
return ref->mBase->mIcon;
}

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

@ -52,7 +52,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)

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

@ -102,10 +102,9 @@ namespace MWClass
return std::string("Item Lockpick Down");
}
std::string Lockpick::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Lockpick::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Lockpick> *ref =
ptr.get<ESM::Lockpick>();
const MWWorld::LiveCellRef<ESM::Lockpick> *ref = ptr.get<ESM::Lockpick>();
return ref->mBase->mIcon;
}

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

@ -52,7 +52,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)

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

@ -120,10 +120,9 @@ namespace MWClass
return std::string("Item Misc Down");
}
std::string Miscellaneous::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Miscellaneous::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
ptr.get<ESM::Miscellaneous>();
const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = ptr.get<ESM::Miscellaneous>();
return ref->mBase->mIcon;
}

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

@ -48,7 +48,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;

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

@ -97,10 +97,9 @@ namespace MWClass
return std::string("Item Potion Down");
}
std::string Potion::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Potion::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Potion> *ref =
ptr.get<ESM::Potion>();
const MWWorld::LiveCellRef<ESM::Potion> *ref = ptr.get<ESM::Potion>();
return ref->mBase->mIcon;
}

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

@ -51,7 +51,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;

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

@ -102,10 +102,9 @@ namespace MWClass
return std::string("Item Probe Down");
}
std::string Probe::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Probe::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Probe> *ref =
ptr.get<ESM::Probe>();
const MWWorld::LiveCellRef<ESM::Probe> *ref = ptr.get<ESM::Probe>();
return ref->mBase->mIcon;
}

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

@ -52,7 +52,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual boost::shared_ptr<MWWorld::Action> use (const MWWorld::Ptr& ptr)

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

@ -93,10 +93,9 @@ namespace MWClass
return std::string("Item Repair Down");
}
std::string Repair::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Repair::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
{
MWWorld::LiveCellRef<ESM::Repair> *ref =
ptr.get<ESM::Repair>();
const MWWorld::LiveCellRef<ESM::Repair> *ref = ptr.get<ESM::Repair>();
return ref->mBase->mIcon;
}

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

@ -48,7 +48,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getModel(const MWWorld::ConstPtr &ptr) const;

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

@ -245,10 +245,9 @@ namespace MWClass
return std::string("Item Misc Down");
}
std::string Weapon::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Weapon::getInventoryIcon (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->mIcon;
}

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

@ -62,7 +62,7 @@ namespace MWClass
virtual std::string getDownSoundId (const MWWorld::Ptr& ptr) const;
///< Return the put down sound Id
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;

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

@ -267,7 +267,7 @@ namespace MWWorld
throw std::runtime_error("class does not support soundgen look up");
}
std::string Class::getInventoryIcon (const MWWorld::Ptr& ptr) const
std::string Class::getInventoryIcon (const MWWorld::ConstPtr& ptr) const
{
throw std::runtime_error ("class does not have any inventory icon");
}

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

@ -248,7 +248,7 @@ namespace MWWorld
virtual float getArmorRating (const MWWorld::Ptr& ptr) const;
///< @return combined armor rating of this actor
virtual std::string getInventoryIcon (const MWWorld::Ptr& ptr) const;
virtual std::string getInventoryIcon (const MWWorld::ConstPtr& ptr) const;
///< Return name of inventory icon.
virtual std::string getEnchantment (const MWWorld::Ptr& ptr) const;