From 0884a3796f7e6174bf93b1b4311680faa1c67b0a Mon Sep 17 00:00:00 2001
From: dteviot <dteviot@gmail.com>
Date: Sun, 9 Aug 2015 14:20:55 +1200
Subject: [PATCH] extracted function isTargetMagicallyHidden().

---
 apps/openmw/mwmechanics/aicombat.cpp  | 3 +--
 apps/openmw/mwmechanics/aipackage.cpp | 8 ++++++++
 apps/openmw/mwmechanics/aipackage.hpp | 2 ++
 apps/openmw/mwmechanics/aipursue.cpp  | 3 +--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index b1889605d..8a51a4cb0 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -222,8 +222,7 @@ namespace MWMechanics
         MWMechanics::Movement& movement = storage.mMovement;
 
         // Stop attacking if target is not seen
-        if (target.getClass().getCreatureStats(target).getMagicEffects().get(ESM::MagicEffect::Invisibility).getMagnitude() > 0
-                || target.getClass().getCreatureStats(target).getMagicEffects().get(ESM::MagicEffect::Chameleon).getMagnitude() > 75)
+        if (isTargetMagicallyHidden(target))
         {
             movement.mPosition[1] = movement.mPosition[0] = 0;
             return false; // TODO: run away instead of doing nothing
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 77efe62a8..d10edd589 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -4,6 +4,7 @@
 
 #include <components/esm/loadcell.hpp>
 #include <components/esm/loadland.hpp>
+#include <components/esm/loadmgef.hpp>
 
 #include "../mwbase/world.hpp"
 #include "../mwbase/environment.hpp"
@@ -129,3 +130,10 @@ bool MWMechanics::AiPackage::doesPathNeedRecalc(ESM::Pathgrid::Point dest, const
 {
     return distance(mPrevDest, dest) > 10;
 }
+
+bool MWMechanics::AiPackage::isTargetMagicallyHidden(const MWWorld::Ptr& target)
+{
+    MagicEffects& magicEffects(target.getClass().getCreatureStats(target).getMagicEffects());
+    return (magicEffects.get(ESM::MagicEffect::Invisibility).getMagnitude() > 0)
+        || (magicEffects.get(ESM::MagicEffect::Chameleon).getMagnitude() > 75);
+}
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index da43dc6da..d73833b94 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -69,6 +69,8 @@ namespace MWMechanics
             /// Simulates the passing of time
             virtual void fastForward(const MWWorld::Ptr& actor, AiState& state) {}
 
+            bool isTargetMagicallyHidden(const MWWorld::Ptr& target);
+
         protected:
             /// Causes the actor to attempt to walk to the specified location
             /** \return If the actor has arrived at his destination **/
diff --git a/apps/openmw/mwmechanics/aipursue.cpp b/apps/openmw/mwmechanics/aipursue.cpp
index e936505c9..055801fde 100644
--- a/apps/openmw/mwmechanics/aipursue.cpp
+++ b/apps/openmw/mwmechanics/aipursue.cpp
@@ -43,8 +43,7 @@ bool AiPursue::execute (const MWWorld::Ptr& actor, CharacterController& characte
             )
         return true; //Target doesn't exist
 
-    if (target.getClass().getCreatureStats(target).getMagicEffects().get(ESM::MagicEffect::Invisibility).getMagnitude() > 0
-            || target.getClass().getCreatureStats(target).getMagicEffects().get(ESM::MagicEffect::Chameleon).getMagnitude() > 75)
+    if (isTargetMagicallyHidden(target))
         return true;
 
     if(target.getClass().getCreatureStats(target).isDead())