Core/Scripts: Fixed PCH build

3 files changed, 20 insertions, 39 deletions

diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index 2b17e702e1e..2234547c76a 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -48,13 +48,13 @@ class instance_the_eye : public InstanceMapScript
         {
             instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map) { }
 
-            uint64 ThaladredTheDarkener;
-            uint64 LordSanguinar;
-            uint64 GrandAstromancerCapernian;
-            uint64 MasterEngineerTelonicus;
-            uint64 Kaelthas;
-            uint64 Astromancer;
-            uint64 Alar;
+            ObjectGuid ThaladredTheDarkener;
+            ObjectGuid LordSanguinar;
+            ObjectGuid GrandAstromancerCapernian;
+            ObjectGuid MasterEngineerTelonicus;
+            ObjectGuid Kaelthas;
+            ObjectGuid Astromancer;
+            ObjectGuid Alar;
             uint8 KaelthasEventPhase;
             uint8 AlarEventPhase;
 
@@ -65,14 +65,6 @@ class instance_the_eye : public InstanceMapScript
                 SetHeaders(DataHeader);
                 memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
 
-                ThaladredTheDarkener = 0;
-                LordSanguinar = 0;
-                GrandAstromancerCapernian = 0;
-                MasterEngineerTelonicus = 0;
-                Kaelthas = 0;
-                Astromancer = 0;
-                Alar = 0;
-
                 KaelthasEventPhase = 0;
                 AlarEventPhase = 0;
             }
@@ -126,7 +118,7 @@ class instance_the_eye : public InstanceMapScript
                 case DATA_ASTROMANCER:                  return Astromancer;
                 case DATA_ALAR:                         return Alar;
                 }
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             void SetData(uint32 type, uint32 data) override
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index 3c4cf390d49..984af86e645 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -39,14 +39,8 @@ class instance_arcatraz : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
 
-                DalliahGUID       = 0;
-                SoccothratesGUID  = 0;
-                MellicharGUID     = 0;
-                WardensShieldGUID = 0;
-
                 ConversationState = NOT_STARTED;
 
-                memset(StasisPodGUIDs, 0, 5 * sizeof(uint64));
                 memset(StasisPodStates, NOT_STARTED, 5 * sizeof(uint8));
             }
 
@@ -166,7 +160,7 @@ class instance_arcatraz : public InstanceMapScript
                     default:
                         break;
                 }
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             bool SetBossState(uint32 type, EncounterState state) override
@@ -193,11 +187,11 @@ class instance_arcatraz : public InstanceMapScript
             }
 
         protected:
-            uint64 DalliahGUID;
-            uint64 SoccothratesGUID;
-            uint64 StasisPodGUIDs[5];
-            uint64 MellicharGUID;
-            uint64 WardensShieldGUID;
+            ObjectGuid DalliahGUID;
+            ObjectGuid SoccothratesGUID;
+            ObjectGuid StasisPodGUIDs[5];
+            ObjectGuid MellicharGUID;
+            ObjectGuid WardensShieldGUID;
 
             uint8 ConversationState;
             uint8 StasisPodStates[5];
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
index be0878b606a..19453bd3925 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
@@ -29,11 +29,6 @@ class instance_the_botanica : public InstanceMapScript
             instance_the_botanica_InstanceMapScript(Map* map) : InstanceScript(map)
             {
                 SetHeaders(DataHeader);
-                CommanderSarannisGUID       = 0;
-                HighBotanistFreywinnGUID    = 0;
-                ThorngrinTheTenderGUID      = 0;
-                LajGUID                     = 0;
-                WarpSplinterGUID            = 0;
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -78,7 +73,7 @@ class instance_the_botanica : public InstanceMapScript
                         break;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             bool SetBossState(uint32 type, EncounterState state) override
@@ -102,11 +97,11 @@ class instance_the_botanica : public InstanceMapScript
             }
 
         protected:
-            uint64 CommanderSarannisGUID;
-            uint64 HighBotanistFreywinnGUID;
-            uint64 ThorngrinTheTenderGUID;
-            uint64 LajGUID;
-            uint64 WarpSplinterGUID;
+            ObjectGuid CommanderSarannisGUID;
+            ObjectGuid HighBotanistFreywinnGUID;
+            ObjectGuid ThorngrinTheTenderGUID;
+            ObjectGuid LajGUID;
+            ObjectGuid WarpSplinterGUID;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override