Core/Scripts: Fixed PCH build

4 files changed, 31 insertions, 54 deletions

diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
index 7dcc8a09f8e..8e9018a99c9 100644
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -44,20 +44,6 @@ class instance_blood_furnace : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
 
-                TheMakerGUID            = 0;
-                BroggokGUID             = 0;
-                KelidanTheBreakerGUID   = 0;
-
-                BroggokLeverGUID        = 0;
-                PrisonDoor4GUID         = 0;
-
-                memset(PrisonCellGUIDs, 0, 8 * sizeof(uint64));
-
-                PrisonersCell5.clear();
-                PrisonersCell6.clear();
-                PrisonersCell7.clear();
-                PrisonersCell8.clear();
-
                 PrisonerCounter5        = 0;
                 PrisonerCounter6        = 0;
                 PrisonerCounter7        = 0;
@@ -168,7 +154,7 @@ class instance_blood_furnace : public InstanceMapScript
                         return BroggokLeverGUID;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             bool SetBossState(uint32 type, EncounterState state) override
@@ -219,9 +205,9 @@ class instance_blood_furnace : public InstanceMapScript
                 HandleGameObject(PrisonCellGUIDs[DATA_PRISON_CELL8 - DATA_PRISON_CELL1], false);
             }
 
-            void ResetPrisoners(const std::set<uint64>& prisoners)
+            void ResetPrisoners(GuidSet const& prisoners)
             {
-                for (std::set<uint64>::const_iterator i = prisoners.begin(); i != prisoners.end(); ++i)
+                for (GuidSet::const_iterator i = prisoners.begin(); i != prisoners.end(); ++i)
                     if (Creature* prisoner = instance->GetCreature(*i))
                         ResetPrisoner(prisoner);
             }
@@ -273,7 +259,7 @@ class instance_blood_furnace : public InstanceMapScript
                 ResetPrisoner(creature);
             }
 
-            void PrisonerDied(uint64 guid)
+            void PrisonerDied(ObjectGuid guid)
             {
                 if (PrisonersCell5.find(guid) != PrisonersCell5.end() && --PrisonerCounter5 <= 0)
                     ActivateCell(DATA_PRISON_CELL6);
@@ -313,9 +299,9 @@ class instance_blood_furnace : public InstanceMapScript
                 }
             }
 
-            void ActivatePrisoners(std::set<uint64> const& prisoners)
+            void ActivatePrisoners(GuidSet const& prisoners)
             {
-                for (std::set<uint64>::const_iterator i = prisoners.begin(); i != prisoners.end(); ++i)
+                for (GuidSet::const_iterator i = prisoners.begin(); i != prisoners.end(); ++i)
                     if (Creature* prisoner = instance->GetCreature(*i))
                     {
                         prisoner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE);
@@ -324,19 +310,19 @@ class instance_blood_furnace : public InstanceMapScript
             }
 
         protected:
-            uint64 TheMakerGUID;
-            uint64 BroggokGUID;
-            uint64 KelidanTheBreakerGUID;
+            ObjectGuid TheMakerGUID;
+            ObjectGuid BroggokGUID;
+            ObjectGuid KelidanTheBreakerGUID;
 
-            uint64 BroggokLeverGUID;
-            uint64 PrisonDoor4GUID;
+            ObjectGuid BroggokLeverGUID;
+            ObjectGuid PrisonDoor4GUID;
 
-            uint64 PrisonCellGUIDs[8];
+            ObjectGuid PrisonCellGUIDs[8];
 
-            std::set<uint64>PrisonersCell5;
-            std::set<uint64>PrisonersCell6;
-            std::set<uint64>PrisonersCell7;
-            std::set<uint64>PrisonersCell8;
+            GuidSet PrisonersCell5;
+            GuidSet PrisonersCell6;
+            GuidSet PrisonersCell7;
+            GuidSet PrisonersCell8;
 
             uint8 PrisonerCounter5;
             uint8 PrisonerCounter6;
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
index c8ffc7d495a..1c3eb6d8c34 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -40,7 +40,6 @@ class instance_ramparts : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
-                felIronChestGUID = 0;
             }
 
             void OnGameObjectCreate(GameObject* go) override
@@ -74,7 +73,7 @@ class instance_ramparts : public InstanceMapScript
             }
 
         protected:
-            uint64 felIronChestGUID;
+            ObjectGuid felIronChestGUID;
             bool spawned;
         };
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
index 36763753424..7951e25d675 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -58,10 +58,10 @@ class instance_magtheridons_lair : public InstanceMapScript
 
             uint32 m_auiEncounter[MAX_ENCOUNTER];
 
-            uint64 MagtheridonGUID;
-            std::set<uint64> ChannelerGUID;
-            uint64 DoorGUID;
-            std::set<uint64> ColumnGUID;
+            ObjectGuid MagtheridonGUID;
+            GuidSet ChannelerGUID;
+            ObjectGuid DoorGUID;
+            GuidSet ColumnGUID;
 
             uint32 CageTimer;
             uint32 RespawnTimer;
@@ -71,11 +71,6 @@ class instance_magtheridons_lair : public InstanceMapScript
                 SetHeaders(DataHeader);
                 memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
 
-                MagtheridonGUID = 0;
-                ChannelerGUID.clear();
-                DoorGUID = 0;
-                ColumnGUID.clear();
-
                 CageTimer = 0;
                 RespawnTimer = 0;
             }
@@ -131,7 +126,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                 case DATA_MAGTHERIDON:
                     return MagtheridonGUID;
                 }
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             void SetData(uint32 type, uint32 data) override
@@ -152,7 +147,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                         if (m_auiEncounter[1] != NOT_STARTED)
                         {
                             m_auiEncounter[1] = NOT_STARTED;
-                            for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                            for (GuidSet::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                             {
                                 if (Creature* Channeler = instance->GetCreature(*i))
                                 {
@@ -171,7 +166,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                         {
                             m_auiEncounter[1] = IN_PROGRESS;
                             // Let all five channelers aggro.
-                            for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                            for (GuidSet::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                             {
                                 Creature* Channeler = instance->GetCreature(*i);
                                 if (Channeler && Channeler->IsAlive())
@@ -188,7 +183,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                         }
                         break;
                     case DONE: // Add buff and check if all channelers are dead.
-                        for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                        for (GuidSet::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                         {
                             Creature* Channeler = instance->GetCreature(*i);
                             if (Channeler && Channeler->IsAlive())
@@ -204,7 +199,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                     break;
                 case DATA_COLLAPSE:
                     // true - collapse / false - reset
-                    for (std::set<uint64>::const_iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i)
+                    for (GuidSet::const_iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i)
                         DoUseDoorOrButton(*i);
                     break;
                 default:
@@ -239,7 +234,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                 {
                     if (RespawnTimer <= diff)
                     {
-                        for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                        for (GuidSet::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                         {
                             if (Creature* Channeler = instance->GetCreature(*i))
                             {
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
index 5bf1bfe9c88..838297aa21f 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -45,9 +45,6 @@ class instance_shattered_halls : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
-                nethekurseGUID      = 0;
-                nethekurseDoor1GUID = 0;
-                nethekurseDoor2GUID = 0;
             }
 
             void OnGameObjectCreate(GameObject* go) override
@@ -112,13 +109,13 @@ class instance_shattered_halls : public InstanceMapScript
                         return nethekurseDoor2GUID;
                         break;
                 }
-                return 0;
+                return ObjectGuid::Empty;
             }
 
         protected:
-            uint64 nethekurseGUID;
-            uint64 nethekurseDoor1GUID;
-            uint64 nethekurseDoor2GUID;
+            ObjectGuid nethekurseGUID;
+            ObjectGuid nethekurseDoor1GUID;
+            ObjectGuid nethekurseDoor2GUID;
         };
 };