Core/Entities: Use ObjectGuid class in game project

3 files changed, 8 insertions, 17 deletions

diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index cc2af3dcea5..e504a9b179b 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -119,7 +119,6 @@ public:
         {
             Initialize();
             instance = creature->GetInstanceScript();
-            memset(&m_auiLackeyGUID, 0, sizeof(m_auiLackeyGUID));
             LackeyEntryList.clear();
         }
 
@@ -138,7 +137,7 @@ public:
         InstanceScript* instance;
 
         std::vector<uint32> LackeyEntryList;
-        uint64 m_auiLackeyGUID[MAX_ACTIVE_LACKEY];
+        ObjectGuid m_auiLackeyGUID[MAX_ACTIVE_LACKEY];
 
         uint8 PlayersKilled;
 
@@ -1054,7 +1053,6 @@ public:
         boss_garaxxasAI(Creature* creature) : boss_priestess_lackey_commonAI(creature)
         {
             Initialize();
-            m_uiPetGUID = 0;
         }
 
         void Initialize()
@@ -1067,7 +1065,7 @@ public:
             Freezing_Trap_Timer = 15000;
         }
 
-        uint64 m_uiPetGUID;
+        ObjectGuid m_uiPetGUID;
 
         uint32 Aimed_Shot_Timer;
         uint32 Shoot_Timer;
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index d34123c58b2..834ae373e71 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -71,7 +71,6 @@ class boss_selin_fireheart : public CreatureScript
         {
             boss_selin_fireheartAI(Creature* creature) : BossAI(creature, DATA_SELIN)
             {
-                CrystalGUID = 0;
                 _scheduledEvents = false;
             }
 
@@ -89,7 +88,7 @@ class boss_selin_fireheart : public CreatureScript
                 }
 
                 _Reset();
-                CrystalGUID = 0;
+                CrystalGUID.Clear();
                 _scheduledEvents = false;
             }
 
@@ -255,7 +254,7 @@ class boss_selin_fireheart : public CreatureScript
 
         private:
             std::list<Creature*> Crystals;
-            uint64 CrystalGUID;
+            ObjectGuid CrystalGUID;
             bool _scheduledEvents;
         };
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index 01491c53f72..95ac29e7a9e 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -50,12 +50,6 @@ class instance_magisters_terrace : public InstanceMapScript
                 LoadDoorData(doorData);
 
                 DelrissaDeathCount = 0;
-
-                SelinGUID          = 0;
-                DelrissaGUID       = 0;
-                EscapeOrbGUID      = 0;
-
-                memset(KaelStatue, 0, 2 * sizeof(uint64));
             }
 
             uint32 GetData(uint32 type) const override
@@ -183,10 +177,10 @@ class instance_magisters_terrace : public InstanceMapScript
             }
 
         protected:
-            uint64 SelinGUID;
-            uint64 DelrissaGUID;
-            uint64 KaelStatue[2];
-            uint64 EscapeOrbGUID;
+            ObjectGuid SelinGUID;
+            ObjectGuid DelrissaGUID;
+            ObjectGuid KaelStatue[2];
+            ObjectGuid EscapeOrbGUID;
             uint32 DelrissaDeathCount;
         };