Core/Scripts: Include cleanup

7 files changed, 31 insertions, 17 deletions

diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
index 08b2255ee8c..cf9ee7c8fae 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp
@@ -24,13 +24,17 @@ SDCategory: Scarlet Monastery
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
-#include "SpellMgr.h"
-#include "scarlet_monastery.h"
+#include "GameObject.h"
+#include "Group.h"
+#include "InstanceScript.h"
 #include "LFGMgr.h"
+#include "Map.h"
+#include "ObjectAccessor.h"
 #include "Player.h"
-#include "Group.h"
+#include "scarlet_monastery.h"
+#include "ScriptedCreature.h"
 #include "SpellInfo.h"
+#include "TemporarySummon.h"
 
 //this texts are already used by 3975 and 3976
 enum Says
@@ -141,7 +145,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_wisp_invisAI(creature);
+        return GetScarletMonasteryAI<npc_wisp_invisAI>(creature);
     }
 
     struct npc_wisp_invisAI : public ScriptedAI
@@ -220,7 +224,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_headAI(creature);
+        return GetScarletMonasteryAI<npc_headAI>(creature);
     }
 
     struct npc_headAI : public ScriptedAI
@@ -373,7 +377,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_headless_horsemanAI>(creature);
+        return GetScarletMonasteryAI<boss_headless_horsemanAI>(creature);
     }
 
     struct boss_headless_horsemanAI : public ScriptedAI
@@ -783,7 +787,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_pulsing_pumpkinAI(creature);
+        return GetScarletMonasteryAI<npc_pulsing_pumpkinAI>(creature);
     }
 
     struct npc_pulsing_pumpkinAI : public ScriptedAI
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
index 7d3f0dd941c..47dff142b8e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_herod.cpp
@@ -146,7 +146,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return new npc_scarlet_traineeAI(creature);
+        return GetScarletMonasteryAI<npc_scarlet_traineeAI>(creature);
     }
 
     struct npc_scarlet_traineeAI : public npc_escortAI
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
index 12e28747256..0df48fc2f1f 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_high_inquisitor_fairbanks.cpp
@@ -24,8 +24,9 @@ SDCategory: Scarlet Monastery
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
+#include "InstanceScript.h"
 #include "scarlet_monastery.h"
+#include "ScriptedCreature.h"
 
 enum Spells
 {
@@ -44,7 +45,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_high_inquisitor_fairbanksAI>(creature);
+        return GetScarletMonasteryAI<boss_high_inquisitor_fairbanksAI>(creature);
     }
 
     struct boss_high_inquisitor_fairbanksAI : public ScriptedAI
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
index dd2443c12d7..2a2861a5991 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_interrogator_vishas.cpp
@@ -16,8 +16,10 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
 #include "scarlet_monastery.h"
+#include "ScriptedCreature.h"
 
 enum Says
 {
@@ -115,7 +117,7 @@ class boss_interrogator_vishas : public CreatureScript
 
         CreatureAI* GetAI(Creature* creature) const override
         {
-            return GetInstanceAI<boss_interrogator_vishasAI>(creature);
+            return GetScarletMonasteryAI<boss_interrogator_vishasAI>(creature);
         }
 };
 
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
index bc987d5328d..42f2514da79 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp
@@ -24,8 +24,10 @@ SDCategory: Scarlet Monastery
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptedCreature.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
 #include "scarlet_monastery.h"
+#include "ScriptedCreature.h"
 #include "SpellInfo.h"
 
 enum Says
@@ -65,7 +67,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_scarlet_commander_mograineAI>(creature);
+        return GetScarletMonasteryAI<boss_scarlet_commander_mograineAI>(creature);
     }
 
     struct boss_scarlet_commander_mograineAI : public ScriptedAI
@@ -227,7 +229,7 @@ public:
 
     CreatureAI* GetAI(Creature* creature) const override
     {
-        return GetInstanceAI<boss_high_inquisitor_whitemaneAI>(creature);
+        return GetScarletMonasteryAI<boss_high_inquisitor_whitemaneAI>(creature);
     }
 
     struct boss_high_inquisitor_whitemaneAI : public ScriptedAI
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
index cd07bedc628..80c118e6f91 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -16,7 +16,10 @@
  */
 
 #include "ScriptMgr.h"
+#include "Creature.h"
+#include "GameObject.h"
 #include "InstanceScript.h"
+#include "Map.h"
 #include "scarlet_monastery.h"
 
 DoorData const doorData[] =
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
index fede79df5d3..25f4496c819 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/scarlet_monastery.h
@@ -18,6 +18,8 @@
 #ifndef SCARLET_M_
 #define SCARLET_M_
 
+#include "CreatureAIImpl.h"
+
 #define SMScriptName "instance_scarlet_monastery"
 #define DataHeader "SM"
 
@@ -60,7 +62,7 @@ enum SMGameObjectIds
     GO_PUMPKIN_SHRINE               = 186267
 };
 
-template<class AI>
+template<typename AI>
 inline AI* GetScarletMonasteryAI(Creature* creature)
 {
     return GetInstanceAI<AI>(creature, SMScriptName);