Merge branch 'no_teleporting_before_you_eat_your_veggies' into 'master'

Delay teleportation till the menu is closed

Closes #7170

See merge request OpenMW/openmw!2631
7220-lua-add-a-general-purpose-lexical-parser
psi29a 2 years ago
commit e575c25278

@ -974,6 +974,13 @@ namespace MWMechanics
}
else
{
// Morrowind.exe doesn't apply magic effects while the menu is open, we do because we like to see stats
// updated instantly. We don't want to teleport instantly though
if (!dt
&& (effect.mEffectId == ESM::MagicEffect::Recall
|| effect.mEffectId == ESM::MagicEffect::DivineIntervention
|| effect.mEffectId == ESM::MagicEffect::AlmsiviIntervention))
return { MagicApplicationResult::Type::APPLIED, receivedMagicDamage, affectedHealth };
auto& stats = target.getClass().getCreatureStats(target);
auto& magnitudes = stats.getMagicEffects();
if (spellParams.getType() != ESM::ActiveSpells::Type_Ability

Loading…
Cancel
Save