mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 03:40:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix for enchanted items being removed on item equip cycling when they are re-equipped

Browse Source
This commit is contained in:
Jacob Turnbull 2021-04-06 20:12:51 -05:00
parent 9aa5aef2c6
commit bc8db8b8f5
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
apps/openmw/mwworld/actionequip.cpp
View File

@ -91,13 +91,30 @@ namespace MWWorld
// move all slots one towards begin(), then equip the item in the slot that is now free
if (slot == slots_.first.end())
{
for (slot=slots_.first.begin();slot!=slots_.first.end(); ++slot)
ContainerStoreIterator enchItem = invStore.getSelectedEnchantItem();
bool bReEquipEnchItem = false;
for (slot = slots_.first.begin(); slot != slots_.first.end(); ++slot)
{
invStore.unequipSlot(*slot, actor, false);
if (slot+1 != slots_.first.end())
invStore.equip(*slot, invStore.getSlot(*(slot+1)), actor);
if (slot + 1 != slots_.first.end())
{
invStore.equip(*slot, invStore.getSlot(*(slot + 1)), actor);
}
else
{
invStore.equip(*slot, it, actor);
}
//if an enchanted item was re-equipped, set reEquipEnchItem = true
if (invStore.getSlot(*slot) == enchItem)
{
bReEquipEnchItem = true;
}
}
//if re-equip flag is true, select the enchanted item again
if (bReEquipEnchItem)
{
invStore.setSelectedEnchantItem(enchItem);
}
}
}