Make unsuccessful magic teleportation attempts detectable (bug #3765)

OpenMW · Dec 30, 2018 · 05e3263 · 05e3263
1 parent 5e541c1
commit 05e3263
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
     Bug #2987: Editor: some chance and AI data fields can overflow
     Bug #3623: Fix HiDPI on Windows
+    Bug #3765: DisableTeleporting makes Mark/Recall/Intervention effects undetectable
     Bug #4411: Reloading a saved game while falling prevents damage in some cases
     Bug #4540: Rain delay when exiting water
     Bug #4701: PrisonMarker record is not hardcoded like other markers

diff --git a/apps/openmw/mwmechanics/spellcasting.cpp b/apps/openmw/mwmechanics/spellcasting.cpp
@@ -296,17 +296,6 @@ namespace MWMechanics
                     return true; // must still apply to get visual effect and have target regard it as attack
                 }
                 break;
-            case ESM::MagicEffect::AlmsiviIntervention:
-            case ESM::MagicEffect::DivineIntervention:
-            case ESM::MagicEffect::Mark:
-            case ESM::MagicEffect::Recall:
-                if (!MWBase::Environment::get().getWorld()->isTeleportingEnabled())
-                {
-                    if (castByPlayer)
-                        MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
-                    return false;
-                }
-                break;
             case ESM::MagicEffect::WaterWalking:
                 if (target.getClass().isPureWaterCreature(target) && MWBase::Environment::get().getWorld()->isSwimming(target))
                     return false;
@@ -745,21 +734,19 @@ namespace MWMechanics
         else if (target.getClass().isActor() && target == getPlayer())
         {
             MWRender::Animation* anim = MWBase::Environment::get().getWorld()->getAnimation(mCaster);
+            bool teleportingEnabled = MWBase::Environment::get().getWorld()->isTeleportingEnabled();
 
-            if (effectId == ESM::MagicEffect::DivineIntervention)
-            {
-                MWBase::Environment::get().getWorld()->teleportToClosestMarker(target, "divinemarker");
-                anim->removeEffect(ESM::MagicEffect::DivineIntervention);
-                const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
-                    .search("VFX_Summon_end");
-                if (fx)
-                    anim->addEffect("meshes\\" + fx->mModel, -1);
-                return true;
-            }
-            else if (effectId == ESM::MagicEffect::AlmsiviIntervention)
+            if (effectId == ESM::MagicEffect::DivineIntervention || effectId == ESM::MagicEffect::AlmsiviIntervention)
             {
-                MWBase::Environment::get().getWorld()->teleportToClosestMarker(target, "templemarker");
-                anim->removeEffect(ESM::MagicEffect::AlmsiviIntervention);
+                if (!teleportingEnabled)
+                {
+                    if (caster == getPlayer())
+                        MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
+                    return true;
+                }
+                std::string marker = (effectId == ESM::MagicEffect::DivineIntervention) ? "divinemarker" : "templemarker";
+                MWBase::Environment::get().getWorld()->teleportToClosestMarker(target, marker);
+                anim->removeEffect(effectId);
                 const ESM::Static* fx = MWBase::Environment::get().getWorld()->getStore().get<ESM::Static>()
                     .search("VFX_Summon_end");
                 if (fx)
@@ -768,12 +755,26 @@ namespace MWMechanics
             }
             else if (effectId == ESM::MagicEffect::Mark)
             {
-                MWBase::Environment::get().getWorld()->getPlayer().markPosition(
-                            target.getCell(), target.getRefData().getPosition());
+                if (teleportingEnabled)
+                {
+                    MWBase::Environment::get().getWorld()->getPlayer().markPosition(
+                                target.getCell(), target.getRefData().getPosition());
+                }
+                else if (caster == getPlayer())
+                {
+                    MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
+                }
                 return true;
             }
             else if (effectId == ESM::MagicEffect::Recall)
             {
+                if (!teleportingEnabled)
+                {
+                    if (caster == getPlayer())
+                        MWBase::Environment::get().getWindowManager()->messageBox("#{sTeleportDisabled}");
+                    return true;
+                }
+
                 MWWorld::CellStore* markedCell = nullptr;
                 ESM::Position markedPosition;
 
@@ -783,7 +784,7 @@ namespace MWMechanics
                     MWWorld::ActionTeleport action(markedCell->isExterior() ? "" : markedCell->getCell()->mName,
                                             markedPosition, false);
                     action.execute(target);
-                    anim->removeEffect(ESM::MagicEffect::Recall);
+                    anim->removeEffect(effectId);
                 }
                 return true;
             }