*Rename some ai functions.

--HG--
branch : trunk

4 files changed, 18 insertions, 18 deletions

diff --git a/src/bindings/scripts/include/precompiled.h b/src/bindings/scripts/include/precompiled.h
index fa676f460ef..b468fbfc2f9 100644
--- a/src/bindings/scripts/include/precompiled.h
+++ b/src/bindings/scripts/include/precompiled.h
@@ -15,8 +15,8 @@
 #include "sc_creature.h"
 #include "sc_gossip.h"
 #include "sc_instance.h"
-#include "AggressorAI.h"
-#include "NullCreatureAI.h"
+#include "CombatAI.h"
+#include "PassiveAI.h"
 
 #ifdef WIN32
 #include <windows.h>
diff --git a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
index 2e8ed47b6fa..9b1b7db6bdd 100644
--- a/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
+++ b/src/bindings/scripts/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
@@ -336,9 +336,9 @@ int32 m_auiRandomSay[] =
     SAY_DUEL_A, SAY_DUEL_B, SAY_DUEL_C, SAY_DUEL_D, SAY_DUEL_E, SAY_DUEL_F, SAY_DUEL_G, SAY_DUEL_H, SAY_DUEL_I
 };
 
-struct TRINITY_DLL_DECL npc_death_knight_initiateAI : public SpellAI
+struct TRINITY_DLL_DECL npc_death_knight_initiateAI : public CombatAI
 {
-    npc_death_knight_initiateAI(Creature* pCreature) : SpellAI(pCreature)
+    npc_death_knight_initiateAI(Creature* pCreature) : CombatAI(pCreature)
     {
         m_bIsDuelInProgress = false;
     }
@@ -352,7 +352,7 @@ struct TRINITY_DLL_DECL npc_death_knight_initiateAI : public SpellAI
     {
         lose = false;
         me->RestoreFaction();
-        SpellAI::Reset();
+        CombatAI::Reset();
 
         m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_15);
 
@@ -432,7 +432,7 @@ struct TRINITY_DLL_DECL npc_death_knight_initiateAI : public SpellAI
 
         // TODO: spells
 
-        SpellAI::UpdateAI(uiDiff);
+        CombatAI::UpdateAI(uiDiff);
     }
 };
 
diff --git a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
index f98e7667e6e..1b9aac9743d 100644
--- a/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
+++ b/src/bindings/scripts/scripts/northrend/naxxramas/boss_gothik.cpp
@@ -249,9 +249,9 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_gothik_minionAI : public SpellAI
+struct TRINITY_DLL_DECL mob_gothik_minionAI : public CombatAI
 {
-    mob_gothik_minionAI(Creature *c) : SpellAI(c)
+    mob_gothik_minionAI(Creature *c) : CombatAI(c)
     {
         liveSide = me->GetPositionY() < POS_Y_GATE;
     }
@@ -277,7 +277,7 @@ struct TRINITY_DLL_DECL mob_gothik_minionAI : public SpellAI
         if (me->isSummon())
         {
             if (Unit *owner = CAST_SUM(me)->GetSummoner())
-                SpellAI::JustDied(owner);
+                CombatAI::JustDied(owner);
         }
     }
 
@@ -285,7 +285,7 @@ struct TRINITY_DLL_DECL mob_gothik_minionAI : public SpellAI
     {
         if (!gateClose)
         {
-            SpellAI::EnterEvadeMode();
+            CombatAI::EnterEvadeMode();
             return;
         }
 
@@ -318,7 +318,7 @@ struct TRINITY_DLL_DECL mob_gothik_minionAI : public SpellAI
             return;
         }
 
-        SpellAI::UpdateAI(diff);
+        CombatAI::UpdateAI(diff);
     }
 };
 
diff --git a/src/bindings/scripts/scripts/world/npcs_special.cpp b/src/bindings/scripts/scripts/world/npcs_special.cpp
index 20f4f7d7808..8c6d6eee169 100644
--- a/src/bindings/scripts/scripts/world/npcs_special.cpp
+++ b/src/bindings/scripts/scripts/world/npcs_special.cpp
@@ -1673,13 +1673,13 @@ CreatureAI* GetAI_mob_mojo(Creature* pCreature)
     return new mob_mojoAI (pCreature);
 }
 
-struct TRINITY_DLL_DECL npc_mirror_image : SpellCasterAI
+struct TRINITY_DLL_DECL npc_mirror_image : CasterAI
 {
-    npc_mirror_image(Creature *c) : SpellCasterAI(c) {}
+    npc_mirror_image(Creature *c) : CasterAI(c) {}
 
     void InitializeAI()
     {
-        SpellCasterAI::InitializeAI();
+        CasterAI::InitializeAI();
         Unit * owner = me->GetOwner();
         if (!owner)
             return;
@@ -1713,15 +1713,15 @@ CreatureAI* GetAI_npc_mirror_image(Creature* pCreature)
     return new npc_mirror_image (pCreature);
 }
 
-struct TRINITY_DLL_DECL npc_ebon_gargoyleAI : SpellCasterAI
+struct TRINITY_DLL_DECL npc_ebon_gargoyleAI : CasterAI
 {
-    npc_ebon_gargoyleAI(Creature *c) : SpellCasterAI(c) {}
+    npc_ebon_gargoyleAI(Creature *c) : CasterAI(c) {}
 
     int despawnTimer;
 
     void InitializeAI()
     {
-        SpellCasterAI::InitializeAI();
+        CasterAI::InitializeAI();
         Unit * owner = me->GetOwner();
         if (!owner)
             return;
@@ -1789,7 +1789,7 @@ struct TRINITY_DLL_DECL npc_ebon_gargoyleAI : SpellCasterAI
             }
             return;
         }
-        SpellCasterAI::UpdateAI(diff);
+        CasterAI::UpdateAI(diff);
     }
 };