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

Accept a ConstPtr in canSell

Browse Source
openmw-38
scrawl 9 years ago
parent 2bc851c7d3
commit 0047a2d330
26 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
apps/openmw/mwclass/apparatus.cpp
Unescape Escape View File

@ -144,7 +144,7 @@ namespace MWClass
return MWWorld::Ptr(cell.insert(ref), &cell);
}
bool Apparatus::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Apparatus::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return (npcServices & ESM::NPC::Apparatus) != 0;
}

2
apps/openmw/mwclass/apparatus.hpp
Unescape Escape View File

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

2
apps/openmw/mwclass/armor.cpp
Unescape Escape View File

@ -382,7 +382,7 @@ namespace MWClass
return ref->mBase->mData.mEnchant;
}
bool Armor::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Armor::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return (npcServices & ESM::NPC::Armor)
|| ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());

2
apps/openmw/mwclass/armor.hpp
Unescape Escape View File

@ -85,7 +85,7 @@ namespace MWClass
virtual int getEnchantmentPoints (const MWWorld::Ptr& ptr) const;
virtual bool canSell (const MWWorld::Ptr& item, int npcServices) const;
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
/// Get the effective armor rating, factoring in the actor's skills, for the given armor.
virtual int getEffectiveArmorRating(const MWWorld::ConstPtr& armor, const MWWorld::Ptr& actor) const;

2
apps/openmw/mwclass/book.cpp
Unescape Escape View File

@ -190,7 +190,7 @@ namespace MWClass
return ref->mBase->mData.mEnchant;
}
bool Book::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Book::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return (npcServices & ESM::NPC::Books)
|| ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());

2
apps/openmw/mwclass/book.hpp
Unescape Escape View File

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

2
apps/openmw/mwclass/clothing.cpp
Unescape Escape View File

@ -278,7 +278,7 @@ namespace MWClass
return ref->mBase->mData.mEnchant;
}
bool Clothing::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Clothing::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return (npcServices & ESM::NPC::Clothing)
|| ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());

2
apps/openmw/mwclass/clothing.hpp
Unescape Escape View File

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

2
apps/openmw/mwclass/ingredient.cpp
Unescape Escape View File

@ -181,7 +181,7 @@ namespace MWClass
return MWWorld::Ptr(cell.insert(ref), &cell);
}
bool Ingredient::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Ingredient::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return (npcServices & ESM::NPC::Ingredients) != 0;
}

2
apps/openmw/mwclass/ingredient.hpp
Unescape Escape View File

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

2
apps/openmw/mwclass/light.cpp
Unescape Escape View File

@ -213,7 +213,7 @@ namespace MWClass
return MWWorld::Ptr(cell.insert(ref), &cell);
}
bool Light::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Light::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return (npcServices & ESM::NPC::Lights) != 0;
}

2
apps/openmw/mwclass/light.hpp
Unescape Escape View File

@ -69,7 +69,7 @@ namespace MWClass
virtual float getWeight (const MWWorld::Ptr& ptr) const;
virtual bool canSell (const MWWorld::Ptr& item, int npcServices) const;
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
std::pair<int, std::string> canBeEquipped(const MWWorld::Ptr &ptr, const MWWorld::Ptr &npc) const;

2
apps/openmw/mwclass/lockpick.cpp
Unescape Escape View File

@ -162,7 +162,7 @@ namespace MWClass
return MWWorld::Ptr(cell.insert(ref), &cell);
}
bool Lockpick::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Lockpick::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return (npcServices & ESM::NPC::Picks) != 0;
}

2
apps/openmw/mwclass/lockpick.hpp
Unescape Escape View File

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

5
apps/openmw/mwclass/misc.cpp
Unescape Escape View File

@ -228,10 +228,9 @@ namespace MWClass
return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionSoulgem(ptr));
}
bool Miscellaneous::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Miscellaneous::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
MWWorld::LiveCellRef<ESM::Miscellaneous> *ref =
item.get<ESM::Miscellaneous>();
const MWWorld::LiveCellRef<ESM::Miscellaneous> *ref = item.get<ESM::Miscellaneous>();
return !ref->mBase->mData.mIsKey && (npcServices & ESM::NPC::Misc) && !isGold(item);
}

2
apps/openmw/mwclass/misc.hpp
Unescape Escape View File

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

2
apps/openmw/mwclass/potion.cpp
Unescape Escape View File

@ -175,7 +175,7 @@ namespace MWClass
return MWWorld::Ptr(cell.insert(ref), &cell);
}
bool Potion::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Potion::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return (npcServices & ESM::NPC::Potions) != 0;
}

2
apps/openmw/mwclass/potion.hpp
Unescape Escape View File

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

2
apps/openmw/mwclass/probe.cpp
Unescape Escape View File

@ -162,7 +162,7 @@ namespace MWClass
return MWWorld::Ptr(cell.insert(ref), &cell);
}
bool Probe::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Probe::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return (npcServices & ESM::NPC::Probes) != 0;
}

2
apps/openmw/mwclass/probe.hpp
Unescape Escape View File

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

2
apps/openmw/mwclass/repair.cpp
Unescape Escape View File

@ -161,7 +161,7 @@ namespace MWClass
return boost::shared_ptr<MWWorld::Action>(new MWWorld::ActionRepair(ptr));
}
bool Repair::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Repair::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return (npcServices & ESM::NPC::RepairItem) != 0;
}

2
apps/openmw/mwclass/repair.hpp
Unescape Escape View File

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

2
apps/openmw/mwclass/weapon.cpp
Unescape Escape View File

@ -419,7 +419,7 @@ namespace MWClass
return ref->mBase->mData.mEnchant;
}
bool Weapon::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Weapon::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return (npcServices & ESM::NPC::Weapon)
|| ((npcServices & ESM::NPC::MagicItems) && !getEnchantment(item).empty());

2
apps/openmw/mwclass/weapon.hpp
Unescape Escape View File

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

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

@ -55,7 +55,7 @@ namespace MWWorld
throw std::runtime_error ("class does not represent an actor");
}
bool Class::canSell (const MWWorld::Ptr& item, int npcServices) const
bool Class::canSell (const MWWorld::ConstPtr& item, int npcServices) const
{
return false;
}

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

@ -261,7 +261,7 @@ namespace MWWorld
virtual void adjustScale(const MWWorld::Ptr& ptr, osg::Vec3f& scale, bool rendering) const;
/// @param rendering Indicates if the scale to adjust is for the rendering mesh, or for the collision mesh
virtual bool canSell (const MWWorld::Ptr& item, int npcServices) const;
virtual bool canSell (const MWWorld::ConstPtr& item, int npcServices) const;
///< Determine whether or not \a item can be sold to an npc with the given \a npcServices
virtual int getServices (const MWWorld::Ptr& actor) const;

Write Preview
Loading…
Cancel
Save