Use getBaseNode to detect if the actor is active

Author: Assumeru

apps/openmw/mwmechanics/aicombat.cpp

@@ -18,8 +18,6 @@
 #include "../mwbase/mechanicsmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwlua/localscripts.hpp"
-
 #include "actorutil.hpp"
 #include "aicombataction.hpp"
 #include "character.hpp"
@@ -121,17 +119,9 @@ namespace MWMechanics
 
         // Stop if the target doesn't exist
         if (target.isEmpty() || !target.getCellRef().getCount() || !target.getRefData().isEnabled()
-            || target.getClass().getCreatureStats(target).isDead())
+            || target.getClass().getCreatureStats(target).isDead() || !target.getRefData().getBaseNode())
             return true;
 
-        // This is equivalent to checking if the actor is registered with the mechanics manager since every actor has a
-        // script
-        if (const MWLua::LocalScripts* scripts = target.getRefData().getLuaScripts())
-        {
-            if (!scripts->isActive())
-                return true;
-        }
-
         if (actor == target) // This should never happen.
             return true;
 

apps/openmw/mwmechanics/aipursue.cpp

@@ -7,8 +7,6 @@
 #include "../mwbase/windowmanager.hpp"
 #include "../mwbase/world.hpp"
 
-#include "../mwlua/localscripts.hpp"
-
 #include "../mwworld/class.hpp"
 
 #include "actorutil.hpp"
@@ -38,17 +36,10 @@ namespace MWMechanics
         const MWWorld::Ptr target = getTarget(); // The target to follow
 
         // Stop if the target doesn't exist
-        if (target.isEmpty() || !target.getCellRef().getCount() || !target.getRefData().isEnabled())
+        if (target.isEmpty() || !target.getCellRef().getCount() || !target.getRefData().isEnabled()
+            || !target.getRefData().getBaseNode())
             return true;
 
-        // This is equivalent to checking if the actor is registered with the mechanics manager since every actor has a
-        // script
-        if (const MWLua::LocalScripts* scripts = target.getRefData().getLuaScripts())
-        {
-            if (!scripts->isActive())
-                return true;
-        }
-
         if (isTargetMagicallyHidden(target)
             && !MWBase::Environment::get().getMechanicsManager()->awarenessCheck(target, actor, false))
             return false;