mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-27 03:35:27 +00:00
Code Issues Projects Releases Wiki Activity

Fix restacking unequipped items

Browse Source
This commit is contained in:
scrawl 2013-11-14 19:54:00 +01:00
parent da85f3e575
commit 49125fa26e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/openmw/mwworld/inventorystore.cpp
View File

@ -443,6 +443,9 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, c
{ {
ContainerStoreIterator retval = it; ContainerStoreIterator retval = it;
// empty this slot
mSlots[slot] = end();
if (restack) { if (restack) {
// restack item previously in this slot // restack item previously in this slot
for (MWWorld::ContainerStoreIterator iter (begin()); iter != end(); ++iter) for (MWWorld::ContainerStoreIterator iter (begin()); iter != end(); ++iter)
@ -457,9 +460,6 @@ MWWorld::ContainerStoreIterator MWWorld::InventoryStore::unequipSlot(int slot, c
} }
} }
// empty this slot
mSlots[slot] = end();
if (actor.getRefData().getHandle() == "player") if (actor.getRefData().getHandle() == "player")
{ {
// Unset OnPCEquip Variable on item's script, if it has a script with that variable declared // Unset OnPCEquip Variable on item's script, if it has a script with that variable declared