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

Add method InventoryStore::unequipSlot()

Browse source 
This will permit to do run a treatment when an item is unequipped.
This commit is contained in:
Emanuel Guevel 2013-11-01 00:54:54 +01:00
parent 10abb9d297
commit d05baa8c22
2 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
apps/openmw/mwworld/inventorystore.cpp
View file

@ -129,18 +129,7 @@ void MWWorld::InventoryStore::equip (int slot, const ContainerStoreIterator& ite
void MWWorld::InventoryStore::unequipAll(const MWWorld::Ptr& actor) void MWWorld::InventoryStore::unequipAll(const MWWorld::Ptr& actor)
{ {
for (int slot=0; slot < MWWorld::InventoryStore::Slots; ++slot) for (int slot=0; slot < MWWorld::InventoryStore::Slots; ++slot)
{ unequipSlot(slot, actor);
MWWorld::ContainerStoreIterator it = getSlot(slot);
if (it != end())
{
equip(slot, end());
std::string script = MWWorld::Class::get(*it).getScript(*it);
// Unset OnPCEquip Variable on item's script, if it has a script with that variable declared
if((actor.getRefData().getHandle() == "player") && (script != ""))
(*it).getRefData().getLocals().setVarByInt(script, "onpcequip", 0);
}
}
} }
MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSlot (int slot) MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSlot (int slot)
@ -328,5 +317,29 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::getSelectedEnchantItem(
int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor) int MWWorld::InventoryStore::remove(const Ptr& item, int count, const Ptr& actor)
{ {
for (int slot=0; slot < MWWorld::InventoryStore::Slots; ++slot)
{
if (mSlots[slot] == end())
continue;
if (*mSlots[slot] == item)
{
unequipSlot(slot, actorPtr);
break;
}
}
return ContainerStore::remove(item, count, actor); return ContainerStore::remove(item, count, actor);
} }
void MWWorld::InventoryStore::unequipSlot(int slot, const MWWorld::Ptr& actor)
{
ContainerStoreIterator it = getSlot(slot);
if (it != end())
{
equip(slot, end());
/// \todo update actor model
}
}

4
apps/openmw/mwworld/inventorystore.hpp
View file

@ -111,9 +111,9 @@ namespace MWWorld
virtual int remove(const Ptr& item, int count, const Ptr& actor); virtual int remove(const Ptr& item, int count, const Ptr& actor);
///< Remove \a count item(s) designated by \a item from this inventory. ///< Remove \a count item(s) designated by \a item from this inventory.
/// ///
/// \todo check if the item is equipped and do stuff
///
/// @return the number of items actually removed /// @return the number of items actually removed
void unequipSlot(int slot, const Ptr& actor);
}; };
} }