Core/Scripts: Fixed build of boss_* scripts

7 files changed, 81 insertions, 87 deletions

diff --git a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
index f03caa37cb2..b41e7e77452 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_gurtogg_bloodboil.cpp
@@ -73,7 +73,7 @@ public:
 
         InstanceScript* instance;
 
-        uint64 TargetGUID;
+        ObjectGuid TargetGUID;
 
         float TargetThreat;
 
@@ -94,7 +94,7 @@ public:
         {
             instance->SetBossState(DATA_GURTOGG_BLOODBOIL, NOT_STARTED);
 
-            TargetGUID = 0;
+            TargetGUID.Clear();
 
             TargetThreat = 0;
 
@@ -134,7 +134,7 @@ public:
             Talk(SAY_DEATH);
         }
 
-        void RevertThreatOnTarget(uint64 guid)
+        void RevertThreatOnTarget(ObjectGuid guid)
         {
             if (Unit* unit = ObjectAccessor::GetUnit(*me, guid))
             {
@@ -258,7 +258,7 @@ public:
                 {
                     if (TargetGUID)
                         RevertThreatOnTarget(TargetGUID);
-                    TargetGUID = 0;
+                    TargetGUID.Clear();
                     Phase1 = true;
                     BloodboilTimer = 10000;
                     BloodboilCount = 0;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 6bf29a307be..3f08ecad7b7 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -383,7 +383,7 @@ public:
         {
             FlameBlastTimer = 15000;
             CheckTimer = 5000;
-            GlaiveGUID = 0;
+            GlaiveGUID.Clear();
         }
 
         void EnterCombat(Unit* /*who*/) override
@@ -426,7 +426,7 @@ public:
             }
         }
 
-        void SetGlaiveGUID(uint64 guid)
+        void SetGlaiveGUID(ObjectGuid guid)
         {
             GlaiveGUID = guid;
         }
@@ -457,7 +457,7 @@ public:
     private:
         uint32 FlameBlastTimer;
         uint32 CheckTimer;
-        uint64 GlaiveGUID;
+        ObjectGuid GlaiveGUID;
     };
 
     CreatureAI* GetAI(Creature* creature) const override
@@ -478,7 +478,6 @@ public:
         {
             instance = creature->GetInstanceScript();
             DoCast(me, SPELL_DUAL_WIELD, true);
-            AkamaGUID = 0;
         }
 
         void Reset() override;
@@ -491,7 +490,7 @@ public:
             {
                 for (uint8 i = 0; i < 2; ++i)
                     if (summon->GetGUID() == FlameGUID[i])
-                        FlameGUID[i] = 0;
+                        FlameGUID[i].Clear();
 
                 if (!FlameGUID[0] && !FlameGUID[1] && Phase != PHASE_ILLIDAN_NULL)
                 {
@@ -575,7 +574,7 @@ public:
             }
         }
 
-        void DeleteFromThreatList(uint64 TargetGUID)
+        void DeleteFromThreatList(ObjectGuid TargetGUID)
         {
             ThreatContainer::StorageType threatlist = me->getThreatManager().getThreatList();
             for (ThreatContainer::StorageType::const_iterator itr = threatlist.begin(); itr != threatlist.end(); ++itr)
@@ -852,7 +851,7 @@ public:
                         if (Creature* glaive = ObjectAccessor::GetCreature(*me, GlaiveGUID[i]))
                             glaive->DespawnOrUnsummon();
 
-                        GlaiveGUID[i] = 0;
+                        GlaiveGUID[i].Clear();
                     }
                 }
                 Timer[EVENT_FLIGHT_SEQUENCE] = 2000;
@@ -1105,7 +1104,7 @@ public:
         }
 
     public:
-        uint64 AkamaGUID;
+        ObjectGuid AkamaGUID;
         uint32 Timer[EVENT_ENRAGE + 1];
         PhaseIllidan Phase;
     private:
@@ -1115,9 +1114,9 @@ public:
         uint32 TransformCount;
         uint32 FlightCount;
         uint32 HoverPoint;
-        uint64 MaievGUID;
-        uint64 FlameGUID[2];
-        uint64 GlaiveGUID[2];
+        ObjectGuid MaievGUID;
+        ObjectGuid FlameGUID[2];
+        ObjectGuid GlaiveGUID[2];
         SummonList Summons;
     };
 
@@ -1143,7 +1142,7 @@ public:
         {
             MaxTimer = 0;
             Phase = PHASE_NORMAL_MAIEV;
-            IllidanGUID = 0;
+            IllidanGUID.Clear();
             Timer[EVENT_MAIEV_STEALTH] = 0;
             Timer[EVENT_MAIEV_TAUNT] = urand(22, 43) * 1000;
             Timer[EVENT_MAIEV_SHADOW_STRIKE] = 30000;
@@ -1156,7 +1155,7 @@ public:
 
         void EnterEvadeMode() override { }
 
-        void GetIllidanGUID(uint64 guid)
+        void GetIllidanGUID(ObjectGuid guid)
         {
             IllidanGUID = guid;
         }
@@ -1336,7 +1335,7 @@ public:
         }
 
     private:
-        uint64 IllidanGUID;
+        ObjectGuid IllidanGUID;
         PhaseIllidan Phase;
         EventMaiev Event;
         uint32 Timer[5];
@@ -1388,9 +1387,9 @@ public:
                     instance->HandleGameObject(DoorGUID[i], true);
             }
 
-            ChannelGUID   = 0;
-            SpiritGUID[0] = 0;
-            SpiritGUID[1] = 0;
+            ChannelGUID.Clear();
+            SpiritGUID[0].Clear();
+            SpiritGUID[1].Clear();
 
             Phase         = PHASE_AKAMA_NULL;
             Timer         = 0;
@@ -1761,11 +1760,11 @@ public:
         PhaseAkama Phase;
         bool Event;
         uint32 Timer;
-        uint64 IllidanGUID;
-        uint64 ChannelGUID;
-        uint64 SpiritGUID[2];
-        uint64 GateGUID;
-        uint64 DoorGUID[2];
+        ObjectGuid IllidanGUID;
+        ObjectGuid ChannelGUID;
+        ObjectGuid SpiritGUID[2];
+        ObjectGuid GateGUID;
+        ObjectGuid DoorGUID[2];
         uint32 ChannelCount;
         uint32 WalkCount;
         uint32 TalkCount;
@@ -1790,11 +1789,11 @@ void boss_illidan_stormrage::boss_illidan_stormrageAI::Reset()
             akama->AI()->EnterEvadeMode();
     }
 
-    MaievGUID = 0;
+    MaievGUID.Clear();
     for (uint8 i = 0; i < 2; ++i)
     {
-        FlameGUID[i] = 0;
-        GlaiveGUID[i] = 0;
+        FlameGUID[i].Clear();
+        GlaiveGUID[i].Clear();
     }
 
     Phase = PHASE_ILLIDAN_NULL;
@@ -1959,7 +1958,7 @@ public:
 
         void Reset() override
         {
-            IllidanGUID = 0;
+            IllidanGUID.Clear();
 
             Active = false;
             SummonedBeams = false;
@@ -2017,7 +2016,7 @@ public:
     public:
         bool Active;
     private:
-        uint64 IllidanGUID;
+        ObjectGuid IllidanGUID;
         uint32 DespawnTimer;
         bool SummonedBeams;
     };
@@ -2062,7 +2061,7 @@ public:
 
         void Reset() override
         {
-            TargetGUID = 0;
+            TargetGUID.Clear();
             DoCast(me, SPELL_SHADOW_DEMON_PASSIVE, true);
         }
 
@@ -2093,7 +2092,7 @@ public:
         }
 
     private:
-        uint64 TargetGUID;
+        ObjectGuid TargetGUID;
     };
 
     CreatureAI* GetAI(Creature* creature) const override
@@ -2198,7 +2197,7 @@ public:
 
     private:
         InstanceScript* instance;
-        uint64 IllidanGUID;
+        ObjectGuid IllidanGUID;
         uint32 CheckTimer;
     };
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index 60162188f7e..39aac706acc 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -112,8 +112,8 @@ public:
 
         void Initialize()
         {
-            for (uint8 i = 0; i<3; ++i)
-                TargetGUID[i] = 0;
+            for (uint8 i = 0; i < 3; ++i)
+                TargetGUID[i].Clear();
 
             BeamCount = 0;
             CurrentBeam = SINISTER_BEAM;   // 0 - Sinister, 1 - Vile, 2 - Wicked, 3 - Sinful
@@ -236,7 +236,7 @@ public:
                             {
                                 if (Unit* unit = ObjectAccessor::GetUnit(*me, TargetGUID[i]))
                                     unit->CastSpell(unit, SPELL_ATTRACTION, true);
-                                TargetGUID[i] = 0;
+                                TargetGUID[i].Clear();
                             }
                         }
                         ++ExplosionCount;
@@ -267,7 +267,7 @@ public:
         }
 
     private:
-        uint64 TargetGUID[3];
+        ObjectGuid TargetGUID[3];
         uint32 BeamCount;
         uint32 CurrentBeam;
         uint32 ExplosionCount;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index f3c8af50328..c5989f4df64 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -113,9 +113,12 @@ public:
     {
         npc_enslaved_soulAI(Creature* creature) : ScriptedAI(creature) { }
 
-        uint64 ReliquaryGUID;
+        ObjectGuid ReliquaryGUID;
 
-        void Reset() override { ReliquaryGUID = 0; }
+        void Reset() override
+        {
+            ReliquaryGUID.Clear(); 
+        }
 
         void EnterCombat(Unit* /*who*/) override
         {
@@ -142,12 +145,11 @@ public:
         boss_reliquary_of_soulsAI(Creature* creature) : ScriptedAI(creature)
         {
             instance = creature->GetInstanceScript();
-            EssenceGUID = 0;
         }
 
         InstanceScript* instance;
 
-        uint64 EssenceGUID;
+        ObjectGuid EssenceGUID;
 
         uint32 Phase;
         uint32 Counter;
@@ -165,7 +167,7 @@ public:
                 if (Creature* essence = ObjectAccessor::GetCreature(*me, EssenceGUID))
                     essence->DespawnOrUnsummon();
 
-                EssenceGUID = 0;
+                EssenceGUID.Clear();
             }
 
             Phase = 0;
@@ -334,17 +336,15 @@ public:
                     if (Essence)
                     {
                         if (Phase == 1)
-                        {
                             Essence->AI()->Talk(SUFF_SAY_AFTER);
-                        }
                         else
-                        {
                             Essence->AI()->Talk(DESI_SAY_AFTER);
-                        }
+
                         Essence->DespawnOrUnsummon();
                     }
+
                     me->SetUInt32Value(UNIT_NPC_EMOTESTATE, 0);
-                    EssenceGUID = 0;
+                    EssenceGUID.Clear();
                     SoulCount = 0;
                     SoulDeathCount = 0;
                     Timer = 3000;
@@ -624,7 +624,7 @@ public:
     {
         boss_essence_of_angerAI(Creature* creature) : ScriptedAI(creature) { }
 
-        uint64 AggroTargetGUID;
+        ObjectGuid AggroTargetGUID;
 
         uint32 CheckTankTimer;
         uint32 SoulScreamTimer;
@@ -636,7 +636,7 @@ public:
 
         void Reset() override
         {
-            AggroTargetGUID = 0;
+            AggroTargetGUID.Clear();
 
             CheckTankTimer = 5000;
             SoulScreamTimer = 10000;
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index 1715401b6c4..6b337e42087 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -175,11 +175,11 @@ public:
         {
             if (!HasKilledAkamaAndReseting)
             {
-                for (std::list<uint64>::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr)
+                for (GuidList::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr)
                     if (Creature* Channeler = ObjectAccessor::GetCreature(*me, *itr))
                         Channeler->DespawnOrUnsummon();
 
-                for (std::list<uint64>::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr)
+                for (GuidList::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr)
                     if (Creature* Spawner = ObjectAccessor::GetCreature(*me, *itr))
                         Spawner->AI()->SetData(SETDATA_DATA, SETDATA_DESPAWN_ALL_SPAWNS);
 
@@ -307,17 +307,13 @@ public:
                     {
                         case EVENT_SET_CHANNELERS_SPAWNERS:
                         {
-                            for (std::list<uint64>::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr)
-                            {
+                            for (GuidList::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr)
                                 if (Creature* Channeler = ObjectAccessor::GetCreature(*me, *itr))
                                     Channeler->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                            }
 
-                            for (std::list<uint64>::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr)
-                            {
+                            for (GuidList::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr)
                                 if (Creature* Spawner = ObjectAccessor::GetCreature(*me, *itr))
                                     Spawner->AI()->SetData(SETDATA_DATA, SETDATA_START_SPAWNING);
-                            }
                             break;
                         }
                         case EVENT_START_ATTACK_AKAMA:
@@ -350,11 +346,11 @@ public:
                         if (Creature* Akama = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_AKAMA_SHADE)))
                             Akama->DespawnOrUnsummon();
 
-                        for (std::list<uint64>::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr)
+                        for (GuidList::const_iterator itr = Channelers.begin(); itr != Channelers.end(); ++itr)
                             if (Creature* Channeler = ObjectAccessor::GetCreature(*me, *itr))
                                 Channeler->DespawnOrUnsummon();
 
-                        for (std::list<uint64>::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr)
+                        for (GuidList::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr)
                             if (Creature* Spawner = ObjectAccessor::GetCreature(*me, *itr))
                                 Spawner->AI()->SetData(SETDATA_DATA, SETDATA_DESPAWN_ALL_SPAWNS);
 
@@ -379,7 +375,7 @@ public:
                             events.CancelEvent(EVENT_START_ATTACK_AKAMA);
                             events.ScheduleEvent(EVENT_ADD_THREAT, 100);
 
-                            for (std::list<uint64>::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr)
+                            for (GuidList::const_iterator itr = Spawners.begin(); itr != Spawners.end(); ++itr)
                                 if (Creature* Spawner = ObjectAccessor::GetCreature(*me, *itr))
                                     Spawner->AI()->SetData(SETDATA_DATA, SETDATA_STOP_SPAWNING);
                         }
@@ -395,8 +391,8 @@ public:
         private:
             InstanceScript* instance;
             EventMap events;
-            std::list<uint64> Channelers;
-            std::list<uint64> Spawners;
+            GuidList Channelers;
+            GuidList Spawners;
             bool akamaReached;
             bool combatStarted;
             bool HasKilledAkamaAndReseting;
@@ -763,7 +759,7 @@ public:
                 }
             }
 
-            summonerGuid     = 0;
+            summonerGuid.Clear();
             startedBanishing = false;
             switchToCombat   = false;
         }
@@ -841,7 +837,7 @@ public:
         private:
             InstanceScript* instance;
             EventMap events;
-            uint64 summonerGuid;
+            ObjectGuid summonerGuid;
             bool startedBanishing;
             bool switchToCombat;
     };
@@ -870,7 +866,7 @@ public:
 
         void Reset() override
         {
-            summonerGuid     = 0;
+            summonerGuid.Clear();
 
             if (Unit* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_AKAMA_SHADE)))
                 AttackStart(target);
@@ -933,7 +929,7 @@ public:
         private:
             InstanceScript* instance;
             EventMap events;
-            uint64 summonerGuid;
+            ObjectGuid summonerGuid;
     };
 
     CreatureAI* GetAI(Creature* creature) const override
@@ -960,7 +956,7 @@ public:
 
         void Reset() override
         {
-            summonerGuid     = 0;
+            summonerGuid.Clear();
 
             if (Unit* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_AKAMA_SHADE)))
                 AttackStart(target);
@@ -1013,7 +1009,7 @@ public:
         private:
             InstanceScript* instance;
             EventMap events;
-            uint64 summonerGuid;
+            ObjectGuid summonerGuid;
     };
 
     CreatureAI* GetAI(Creature* creature) const override
@@ -1040,7 +1036,7 @@ public:
 
         void Reset() override
         {
-            summonerGuid     = 0;
+            summonerGuid.Clear();
 
             if (Unit* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_AKAMA_SHADE)))
                 AttackStart(target);
@@ -1093,7 +1089,7 @@ public:
         private:
             InstanceScript* instance;
             EventMap events;
-            uint64 summonerGuid;
+            ObjectGuid summonerGuid;
     };
 
     CreatureAI* GetAI(Creature* creature) const override
@@ -1122,7 +1118,7 @@ public:
         {
             spiritMend = false;
             chainHeal  = false;
-            summonerGuid = 0;
+            summonerGuid.Clear();
 
             if (Unit* target = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_AKAMA_SHADE)))
                 AttackStart(target);
@@ -1188,7 +1184,7 @@ public:
         private:
             InstanceScript* instance;
             EventMap events;
-            uint64 summonerGuid;
+            ObjectGuid summonerGuid;
             bool spiritMend;
             bool chainHeal;
     };
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 0bbf2cb2a96..081dbc079a7 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -67,13 +67,13 @@ public:
 
         uint32 CheckTeronTimer;
         uint32 ShadowBoltTimer;
-        uint64 TeronGUID;
+        ObjectGuid TeronGUID;
 
         void Reset() override
         {
             CheckTeronTimer = 5000;
             ShadowBoltTimer = 12000;
-            TeronGUID = 0;
+            TeronGUID.Clear();
         }
 
         void EnterCombat(Unit* /*who*/) override { }
@@ -113,7 +113,7 @@ public:
             return;
         }
 
-        void SetTeronGUID(uint64 guid)
+        void SetTeronGUID(ObjectGuid guid)
         {
             TeronGUID = guid;
         }
@@ -134,16 +134,16 @@ public:
     {
         npc_shadowy_constructAI(Creature* creature) : ScriptedAI(creature) { }
 
-        uint64 GhostGUID;
-        uint64 TeronGUID;
+        ObjectGuid GhostGUID;
+        ObjectGuid TeronGUID;
 
         uint32 CheckPlayerTimer;
         uint32 CheckTeronTimer;
 
         void Reset() override
         {
-            GhostGUID = 0;
-            TeronGUID = 0;
+            GhostGUID.Clear();
+            TeronGUID.Clear();
 
             CheckPlayerTimer = 2000;
             CheckTeronTimer = 5000;
@@ -238,8 +238,8 @@ public:
         uint32 RandomYellTimer;
         uint32 AggroTimer;
 
-        uint64 AggroTargetGUID;
-        uint64 GhostGUID;                                       // Player that gets killed by Shadow of Death and gets turned into a ghost
+        ObjectGuid AggroTargetGUID;
+        ObjectGuid GhostGUID;                                       // Player that gets killed by Shadow of Death and gets turned into a ghost
 
         bool Intro;
         bool Done;
@@ -260,7 +260,7 @@ public:
             me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
 
             AggroTimer = 20000;
-            AggroTargetGUID = 0;
+            AggroTargetGUID.Clear();
             Intro = false;
             Done = false;
         }
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index 497b3f9e489..0f80e541261 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -67,13 +67,12 @@ public:
     {

         boss_najentusAI(Creature* creature) : BossAI(creature, DATA_HIGH_WARLORD_NAJENTUS)

         {

-            SpineTargetGUID = 0;

         }

 

         void Reset() override

         {

             _Reset();

-            SpineTargetGUID = 0;

+            SpineTargetGUID.Clear();

         }

 

         void KilledUnit(Unit* /*victim*/) override

@@ -115,7 +114,7 @@ public:
             Unit* target = ObjectAccessor::GetUnit(*me, SpineTargetGUID);

             if (target && target->HasAura(SPELL_IMPALING_SPINE))

                 target->RemoveAurasDueToSpell(SPELL_IMPALING_SPINE);

-            SpineTargetGUID=0;

+            SpineTargetGUID.Clear();

             return true;

         }

 

@@ -181,7 +180,7 @@ public:
         }

 

     private:

-        uint64 SpineTargetGUID;

+        ObjectGuid SpineTargetGUID;

     };

 

     CreatureAI* GetAI(Creature* creature) const override