Core/Entities: Use ObjectGuid class in game project

1 files changed, 9 insertions, 16 deletions

diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
index 3a79dac3a90..a29f8d3374e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -38,13 +38,6 @@ class instance_scarlet_monastery : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
 
-                PumpkinShrineGUID      = 0;
-                HorsemanGUID           = 0;
-                HeadGUID               = 0;
-                MograineGUID           = 0;
-                WhitemaneGUID          = 0;
-                VorrelGUID             = 0;
-
                 HorsemanAdds.clear();
             }
 
@@ -124,7 +117,7 @@ class instance_scarlet_monastery : public InstanceMapScript
                     case DATA_HORSEMAN_EVENT:
                         if (state == DONE)
                         {
-                            for (uint64 guid : HorsemanAdds)
+                            for (ObjectGuid guid : HorsemanAdds)
                             {
                                 Creature* add = instance->GetCreature(guid);
                                 if (add && add->IsAlive())
@@ -157,14 +150,14 @@ class instance_scarlet_monastery : public InstanceMapScript
             }
 
         protected:
-            uint64 PumpkinShrineGUID;
-            uint64 HorsemanGUID;
-            uint64 HeadGUID;
-            uint64 MograineGUID;
-            uint64 WhitemaneGUID;
-            uint64 VorrelGUID;
-
-            std::set<uint64> HorsemanAdds;
+            ObjectGuid PumpkinShrineGUID;
+            ObjectGuid HorsemanGUID;
+            ObjectGuid HeadGUID;
+            ObjectGuid MograineGUID;
+            ObjectGuid WhitemaneGUID;
+            ObjectGuid VorrelGUID;
+
+            GuidSet HorsemanAdds;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override