mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-27 12:40:25 +00:00
Code Issues Releases Wiki Activity

Merge branch 'removed_isnt_remove' into 'master'

Browse source 
Actually remove effects before proclaiming they've been removed

Closes #6480

See merge request OpenMW/openmw!1465
This commit is contained in:
psi29a 2021-12-09 15:08:41 +00:00
commit f3f385fd5e
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/spelleffects.cpp
View file

@ -796,12 +796,16 @@ MagicApplicationResult applyMagicEffect(const MWWorld::Ptr& target, const MWWorl
{ {
if(target == getPlayer()) if(target == getPlayer())
MWBase::Environment::get().getWindowManager()->messageBox ("#{sLevitateDisabled}"); MWBase::Environment::get().getWindowManager()->messageBox ("#{sLevitateDisabled}");
onMagicEffectRemoved(target, spellParams, effect);
return MagicApplicationResult::REMOVED; return MagicApplicationResult::REMOVED;
} }
else if(effect.mEffectId == ESM::MagicEffect::AlmsiviIntervention || effect.mEffectId == ESM::MagicEffect::DivineIntervention || effect.mEffectId == ESM::MagicEffect::Recall) else if(effect.mEffectId == ESM::MagicEffect::AlmsiviIntervention || effect.mEffectId == ESM::MagicEffect::DivineIntervention || effect.mEffectId == ESM::MagicEffect::Recall)
{ {
if(effect.mFlags & ESM::ActiveEffect::Flag_Applied) if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)
{
onMagicEffectRemoved(target, spellParams, effect);
return MagicApplicationResult::REMOVED; return MagicApplicationResult::REMOVED;
}
} }
const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId); const auto* magicEffect = world->getStore().get<ESM::MagicEffect>().find(effect.mEffectId);
if(effect.mFlags & ESM::ActiveEffect::Flag_Applied) if(effect.mFlags & ESM::ActiveEffect::Flag_Applied)