Core/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ScriptedAI::SetCombatMovement(false); to get the same functionality.

4 files changed, 27 insertions, 21 deletions

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
index 2eb1b65fefd..c28d70e2634 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal_trash.cpp
@@ -1408,11 +1408,11 @@ public:
         return new alliance_riflemanAI(creature);
     }
 
-    struct alliance_riflemanAI : public Scripted_NoMovementAI
+    struct alliance_riflemanAI : public ScriptedAI
     {
-        alliance_riflemanAI(Creature* creature) : Scripted_NoMovementAI(creature)
+        alliance_riflemanAI(Creature* creature) : ScriptedAI(creature)
         {
-            Reset();
+            SetCombatMovement(false);
         }
 
         uint32 ExplodeTimer;
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
index 285d893fe41..c69a696827e 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp
@@ -197,11 +197,12 @@ class npc_buru_egg : public CreatureScript
     public:
         npc_buru_egg() : CreatureScript("npc_buru_egg") { }
 
-        struct npc_buru_eggAI : public Scripted_NoMovementAI
+        struct npc_buru_eggAI : public ScriptedAI
         {
-            npc_buru_eggAI(Creature* creature) : Scripted_NoMovementAI(creature)
+            npc_buru_eggAI(Creature* creature) : ScriptedAI(creature)
             {
                 _instance = me->GetInstanceScript();
+                SetCombatMovement(false);
             }
 
             void EnterCombat(Unit* attacker)
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
index 3da1fc1dc5c..b5fbd644592 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp
@@ -156,13 +156,15 @@ public:
         return new eye_of_cthunAI (creature);
     }
 
-    struct eye_of_cthunAI : public Scripted_NoMovementAI
+    struct eye_of_cthunAI : public ScriptedAI
     {
-        eye_of_cthunAI(Creature* creature) : Scripted_NoMovementAI(creature)
+        eye_of_cthunAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
             if (!instance)
                 sLog->outError(LOG_FILTER_TSCR, "No Instance eye_of_cthunAI");
+
+            SetCombatMovement(false);
         }
 
         InstanceScript* instance;
@@ -460,9 +462,9 @@ public:
         return new cthunAI (creature);
     }
 
-    struct cthunAI : public Scripted_NoMovementAI
+    struct cthunAI : public ScriptedAI
     {
-        cthunAI(Creature* creature) : Scripted_NoMovementAI(creature)
+        cthunAI(Creature* creature) : ScriptedAI(creature)
         {
             SetCombatMovement(false);
 
@@ -916,15 +918,17 @@ public:
         return new eye_tentacleAI (creature);
     }
 
-    struct eye_tentacleAI : public Scripted_NoMovementAI
+    struct eye_tentacleAI : public ScriptedAI
     {
-        eye_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
+        eye_tentacleAI(Creature* creature) : ScriptedAI(creature)
         {
             if (Creature* pPortal = me->SummonCreature(MOB_SMALL_PORTAL, *me, TEMPSUMMON_CORPSE_DESPAWN))
             {
                 pPortal->SetReactState(REACT_PASSIVE);
                 Portal = pPortal->GetGUID();
             }
+
+            SetCombatMovement(false);
         }
 
         uint32 MindflayTimer;
@@ -989,9 +993,9 @@ public:
         return new claw_tentacleAI (creature);
     }
 
-    struct claw_tentacleAI : public Scripted_NoMovementAI
+    struct claw_tentacleAI : public ScriptedAI
     {
-        claw_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
+        claw_tentacleAI(Creature* creature) : ScriptedAI(creature)
         {
             SetCombatMovement(false);
 
@@ -1099,9 +1103,9 @@ public:
         return new giant_claw_tentacleAI (creature);
     }
 
-    struct giant_claw_tentacleAI : public Scripted_NoMovementAI
+    struct giant_claw_tentacleAI : public ScriptedAI
     {
-        giant_claw_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
+        giant_claw_tentacleAI(Creature* creature) : ScriptedAI(creature)
         {
             SetCombatMovement(false);
 
@@ -1218,9 +1222,9 @@ public:
         return new giant_eye_tentacleAI (creature);
     }
 
-    struct giant_eye_tentacleAI : public Scripted_NoMovementAI
+    struct giant_eye_tentacleAI : public ScriptedAI
     {
-        giant_eye_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
+        giant_eye_tentacleAI(Creature* creature) : ScriptedAI(creature)
         {
             SetCombatMovement(false);
 
@@ -1282,9 +1286,9 @@ public:
         return new flesh_tentacleAI (creature);
     }
 
-    struct flesh_tentacleAI : public Scripted_NoMovementAI
+    struct flesh_tentacleAI : public ScriptedAI
     {
-        flesh_tentacleAI(Creature* creature) : Scripted_NoMovementAI(creature)
+        flesh_tentacleAI(Creature* creature) : ScriptedAI(creature)
         {
             SetCombatMovement(false);
         }
diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp
index fa6b830c1ae..9bd96957a52 100644
--- a/src/server/scripts/Kalimdor/zone_durotar.cpp
+++ b/src/server/scripts/Kalimdor/zone_durotar.cpp
@@ -175,10 +175,11 @@ class npc_tiger_matriarch_credit : public CreatureScript
     public:
         npc_tiger_matriarch_credit() : CreatureScript("npc_tiger_matriarch_credit") { }
 
-        struct npc_tiger_matriarch_creditAI : public Scripted_NoMovementAI
+        struct npc_tiger_matriarch_creditAI : public ScriptedAI
         {
-           npc_tiger_matriarch_creditAI(Creature* creature) : Scripted_NoMovementAI(creature)
+           npc_tiger_matriarch_creditAI(Creature* creature) : ScriptedAI(creature)
            {
+               SetCombatMovement(false);
                events.ScheduleEvent(EVENT_CHECK_SUMMON_AURA, 2000);
            }