AnarchistGamers/openmw
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-09-12 14:01:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'no_teleporting_before_you_eat_your_veggies' into 'master'

Browse Source 
Delay teleportation till the menu is closed

Closes #7170

See merge request OpenMW/openmw!2631
This commit is contained in:
psi29a 2023-01-18 21:55:24 +00:00
commit e575c25278
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -974,6 +974,13 @@ namespace MWMechanics
} }
else 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& stats = target.getClass().getCreatureStats(target);
auto& magnitudes = stats.getMagicEffects(); auto& magnitudes = stats.getMagicEffects();
if (spellParams.getType() != ESM::ActiveSpells::Type_Ability if (spellParams.getType() != ESM::ActiveSpells::Type_Ability