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

Merge branch 'weareboundtogetheryouandi' into 'master'

Browse Source 
Remove the correct bound item when the effect expires

See merge request OpenMW/openmw!2507
This commit is contained in:
psi29a 2022-11-10 22:32:21 +00:00
commit 4520a8c659
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)