mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-29 18:32:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'yet_another_magical_regression' into 'master'

Browse Source 
Remove teleportation effects after they've been applied

Closes #6460

See merge request OpenMW/openmw!1453
This commit is contained in:
jvoisin 2021-12-01 21:39:54 +00:00
commit 31170c3842
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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