mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-29 22:20:33 +00:00
Code Issues Projects Releases Wiki Activity

Remove the correct bound item when the effect expires

Browse Source
This commit is contained in:
Alexei Kotov 2022-11-10 01:17:52 +03:00
parent d29d68f1ba
commit 1d31c5eb6f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw/mwmechanics/spelleffects.cpp
View File

@ -217,10 +217,13 @@ namespace
bool wasEquipped bool wasEquipped
= currentItem != store.end() && Misc::StringUtils::ciEqual(currentItem->getCellRef().getRefId(), itemId); = currentItem != store.end() && Misc::StringUtils::ciEqual(currentItem->getCellRef().getRefId(), itemId);
if (actor != MWMechanics::getPlayer()) if (wasEquipped)
{ store.remove(*currentItem, 1, actor);
else
store.remove(itemId, 1, actor); store.remove(itemId, 1, actor);
if (actor != MWMechanics::getPlayer())
{
// Equip a replacement // Equip a replacement
if (!wasEquipped) if (!wasEquipped)
return; return;
@ -258,8 +261,6 @@ namespace
action.execute(actor); action.execute(actor);
} }
} }
store.remove(itemId, 1, actor);
} }
bool isCorprusEffect(const MWMechanics::ActiveSpells::ActiveEffect& effect, bool harmfulOnly = false) bool isCorprusEffect(const MWMechanics::ActiveSpells::ActiveEffect& effect, bool harmfulOnly = false)