Core/Scripts: Fixed PCH build

12 files changed, 86 insertions, 152 deletions

diff --git a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
index 90b8ce32dd1..b23d0cdaa3c 100644
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -66,14 +66,14 @@ public:
     {
         instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map) { }
 
-        uint64 twilightLordKelrisGUID;
-        uint64 shrine1GUID;
-        uint64 shrine2GUID;
-        uint64 shrine3GUID;
-        uint64 shrine4GUID;
-        uint64 shrineOfGelihastGUID;
-        uint64 altarOfTheDeepsGUID;
-        uint64 mainDoorGUID;
+        ObjectGuid twilightLordKelrisGUID;
+        ObjectGuid shrine1GUID;
+        ObjectGuid shrine2GUID;
+        ObjectGuid shrine3GUID;
+        ObjectGuid shrine4GUID;
+        ObjectGuid shrineOfGelihastGUID;
+        ObjectGuid altarOfTheDeepsGUID;
+        ObjectGuid mainDoorGUID;
 
         uint8 encounter[MAX_ENCOUNTER];
         uint8 countFires;
@@ -84,14 +84,6 @@ public:
             SetHeaders(DataHeader);
             memset(&encounter, 0, sizeof(encounter));
 
-            twilightLordKelrisGUID = 0;
-            shrine1GUID = 0;
-            shrine2GUID = 0;
-            shrine3GUID = 0;
-            shrine4GUID = 0;
-            shrineOfGelihastGUID = 0;
-            altarOfTheDeepsGUID = 0;
-            mainDoorGUID = 0;
             countFires = 0;
             deathTimes = 0;
         }
@@ -254,7 +246,7 @@ public:
                     return mainDoorGUID;
             }
 
-            return 0;
+            return ObjectGuid::Empty;
         }
     };
 };
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 72208652afe..9cb75ec9807 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -62,18 +62,6 @@ public:
             SetHeaders(DataHeader);
             memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
 
-            m_uiAncientGemGUID.clear();
-
-            RageWinterchill    = 0;
-            Anetheron          = 0;
-            Kazrogal           = 0;
-            Azgalor            = 0;
-            Archimonde         = 0;
-            JainaProudmoore    = 0;
-            Thrall             = 0;
-            TyrandeWhisperwind = 0;
-            HordeGate          = 0;
-            ElfGate            = 0;
             RaidDamage         = 0;
             Trash              = 0;
             hordeRetreat       = 0;
@@ -144,7 +132,7 @@ public:
                 case DATA_TYRANDEWHISPERWIND: return TyrandeWhisperwind;
             }
 
-            return 0;
+            return ObjectGuid::Empty;
         }
 
         void SetData(uint32 type, uint32 data) override
@@ -219,7 +207,7 @@ public:
                     {
                         if (!m_uiAncientGemGUID.empty())
                         {
-                            for (std::list<uint64>::const_iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr)
+                            for (GuidList::const_iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr)
                             {
                                 //don't know how long it expected
                                 DoRespawnGameObject(*itr, DAY);
@@ -309,17 +297,17 @@ public:
         protected:
             uint32 m_auiEncounter[EncounterCount];
             std::string str_data;
-            std::list<uint64> m_uiAncientGemGUID;
-            uint64 RageWinterchill;
-            uint64 Anetheron;
-            uint64 Kazrogal;
-            uint64 Azgalor;
-            uint64 Archimonde;
-            uint64 JainaProudmoore;
-            uint64 Thrall;
-            uint64 TyrandeWhisperwind;
-            uint64 HordeGate;
-            uint64 ElfGate;
+            GuidList m_uiAncientGemGUID;
+            ObjectGuid RageWinterchill;
+            ObjectGuid Anetheron;
+            ObjectGuid Kazrogal;
+            ObjectGuid Azgalor;
+            ObjectGuid Archimonde;
+            ObjectGuid JainaProudmoore;
+            ObjectGuid Thrall;
+            ObjectGuid TyrandeWhisperwind;
+            ObjectGuid HordeGate;
+            ObjectGuid ElfGate;
             uint32 Trash;
             uint32 hordeRetreat;
             uint32 allianceRetreat;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
index ea919da8317..e20e976b4b9 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
@@ -61,19 +61,6 @@ class instance_culling_of_stratholme : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
 
-                _chromieGUID       = 0;
-                _arthasGUID        = 0;
-                _meathookGUID      = 0;
-                _salrammGUID       = 0;
-                _epochGUID         = 0;
-                _malGanisGUID      = 0;
-                _infiniteGUID      = 0;
-                _shkafGateGUID     = 0;
-                _malGanisGate1GUID = 0;
-                _malGanisGate2GUID = 0;
-                _exitGateGUID      = 0;
-                _malGanisChestGUID = 0;
-                _genericBunnyGUID  = 0;
                 _crateCount        = 0;
                 _eventTimer        = 0;
             }
@@ -270,7 +257,7 @@ class instance_culling_of_stratholme : public InstanceMapScript
                     default:
                         break;
                 }
-                return 0;
+                return ObjectGuid::Empty;
             }
 
             void Update(uint32 diff) override
@@ -330,19 +317,19 @@ class instance_culling_of_stratholme : public InstanceMapScript
             }
 
         private:
-            uint64 _chromieGUID;
-            uint64 _arthasGUID;
-            uint64 _meathookGUID;
-            uint64 _salrammGUID;
-            uint64 _epochGUID;
-            uint64 _malGanisGUID;
-            uint64 _infiniteGUID;
-            uint64 _shkafGateGUID;
-            uint64 _malGanisGate1GUID;
-            uint64 _malGanisGate2GUID;
-            uint64 _exitGateGUID;
-            uint64 _malGanisChestGUID;
-            uint64 _genericBunnyGUID;
+            ObjectGuid _chromieGUID;
+            ObjectGuid _arthasGUID;
+            ObjectGuid _meathookGUID;
+            ObjectGuid _salrammGUID;
+            ObjectGuid _epochGUID;
+            ObjectGuid _malGanisGUID;
+            ObjectGuid _infiniteGUID;
+            ObjectGuid _shkafGateGUID;
+            ObjectGuid _malGanisGate1GUID;
+            ObjectGuid _malGanisGate2GUID;
+            ObjectGuid _exitGateGUID;
+            ObjectGuid _malGanisChestGUID;
+            ObjectGuid _genericBunnyGUID;
 
             uint32 _crateCount;
             uint32 _eventTimer;
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
index 7bd27a8f042..0220ff98750 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -58,9 +58,9 @@ public:
         uint32 mBarrelCount;
         uint32 mThrallEventCount;
 
-        uint64 ThrallGUID;
-        uint64 TarethaGUID;
-        uint64 EpochGUID;
+        ObjectGuid ThrallGUID;
+        ObjectGuid TarethaGUID;
+        ObjectGuid EpochGUID;
 
         void Initialize() override
         {
@@ -69,9 +69,6 @@ public:
 
             mBarrelCount        = 0;
             mThrallEventCount   = 0;
-            ThrallGUID          = 0;
-            TarethaGUID         = 0;
-            EpochGUID        = 0;
         }
 
         Player* GetPlayerInMap()
@@ -100,7 +97,7 @@ public:
                 for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                 {
                     if (Player* player = itr->GetSource())
-                        player->KilledMonsterCredit(LODGE_QUEST_TRIGGER, 0);
+                        player->KilledMonsterCredit(LODGE_QUEST_TRIGGER);
                 }
             }
         }
@@ -115,9 +112,9 @@ public:
                 case TARETHA_ENTRY:
                     TarethaGUID = creature->GetGUID();
                     break;
-            case EPOCH_ENTRY:
-            EpochGUID = creature->GetGUID();
-            break;
+                case EPOCH_ENTRY:
+                    EpochGUID = creature->GetGUID();
+                    break;
             }
         }
 
@@ -232,10 +229,10 @@ public:
                     return ThrallGUID;
                 case DATA_TARETHA:
                     return TarethaGUID;
-            case DATA_EPOCH:
-            return EpochGUID;
+                case DATA_EPOCH:
+                    return EpochGUID;
             }
-            return 0;
+            return ObjectGuid::Empty;
         }
     };
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
index 720d93333c7..ed49cc41c39 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
@@ -89,13 +89,12 @@ public:
         uint8  mRiftWaveCount;
         uint8  mRiftWaveId;
 
-        uint64 _medivhGUID;
+        ObjectGuid _medivhGUID;
         uint8  _currentRiftId;
 
         void Initialize() override
         {
             SetHeaders(DataHeader);
-            _medivhGUID         = 0;
             Clear();
         }
 
@@ -258,7 +257,7 @@ public:
             if (data == DATA_MEDIVH)
                 return _medivhGUID;
 
-            return 0;
+            return ObjectGuid::Empty;
         }
 
         Creature* SummonedPortalBoss(Creature* me)
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
index 6772c50a16f..4bbbf26b84e 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -53,7 +53,6 @@ public:
             SetHeaders(DataHeader);
             SetBossNumber(EncounterCount);
 
-            onyxiaGUID               = 0;
             onyxiaLiftoffTimer       = 0;
             manyWhelpsCounter        = 0;
             eruptTimer               = 0;
@@ -102,7 +101,7 @@ public:
             }
         }
 
-        void FloorEruption(uint64 floorEruptedGUID)
+        void FloorEruption(ObjectGuid floorEruptedGUID)
         {
             if (GameObject* floorEruption = instance->GetGameObject(floorEruptedGUID))
             {
@@ -121,7 +120,7 @@ public:
                 {
                     if (((*itr)->GetGOInfo()->displayId == 4392 || (*itr)->GetGOInfo()->displayId == 4472) && (*itr)->GetGOInfo()->trap.spellId == 17731)
                     {
-                        uint64 nearFloorGUID = (*itr)->GetGUID();
+                        ObjectGuid nearFloorGUID = (*itr)->GetGUID();
                         if (FloorEruptionGUID[1].find(nearFloorGUID) != FloorEruptionGUID[1].end() && (*FloorEruptionGUID[1].find(nearFloorGUID)).second == 0)
                         {
                             (*FloorEruptionGUID[1].find(nearFloorGUID)).second = (*FloorEruptionGUID[1].find(floorEruptedGUID)).second+1;
@@ -193,7 +192,7 @@ public:
                     return onyxiaGUID;
             }
 
-            return 0;
+            return ObjectGuid::Empty;
         }
 
         void Update(uint32 diff) override
@@ -212,8 +211,8 @@ public:
             {
                 if (eruptTimer <= diff)
                 {
-                    uint64 frontGuid = FloorEruptionGUIDQueue.front();
-                    std::map<uint64, uint32>::iterator itr = FloorEruptionGUID[1].find(frontGuid);
+                    ObjectGuid frontGuid = FloorEruptionGUIDQueue.front();
+                    std::map<ObjectGuid, uint32>::iterator itr = FloorEruptionGUID[1].find(frontGuid);
                     if (itr != FloorEruptionGUID[1].end())
                     {
                         uint32 treeHeight = itr->second;
@@ -252,11 +251,9 @@ public:
         }
 
     protected:
-        std::map<uint64, uint32> FloorEruptionGUID[2];
-        std::queue<uint64> FloorEruptionGUIDQueue;
-        uint64 onyxiaGUID;
-        uint64 triggerGUID;
-        uint64 tankGUID;
+        std::map<ObjectGuid, uint32> FloorEruptionGUID[2];
+        std::queue<ObjectGuid> FloorEruptionGUIDQueue;
+        ObjectGuid onyxiaGUID;
         uint32 onyxiaLiftoffTimer;
         uint32 manyWhelpsCounter;
         uint32 eruptTimer;
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
index ca5e6a9828c..8a82f782918 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
@@ -59,7 +59,6 @@ public:
 
         void Initialize() override
         {
-            goGongGUID      = 0;
             gongWave        = 0;
             fiendsKilled    = 0;
             reaversKilled   = 0;
@@ -172,7 +171,7 @@ public:
         }
 
     protected:
-        uint64 goGongGUID;
+        ObjectGuid goGongGUID;
         uint16 gongWave;
         uint8  fiendsKilled;
         uint8  reaversKilled;
diff --git a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
index 6f9ba0afa7b..07cb6e65ee9 100644
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -44,14 +44,13 @@ public:
     {
         instance_razorfen_kraul_InstanceMapScript(Map* map) : InstanceScript(map) { }
 
-        uint64 DoorWardGUID;
+        ObjectGuid DoorWardGUID;
         int WardKeeperDeath;
 
         void Initialize() override
         {
             SetHeaders(DataHeader);
             WardKeeperDeath = 0;
-            DoorWardGUID = 0;
         }
 
         Player* GetPlayerInMap()
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
index 1fa637e81d4..0e34f4a5595 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
@@ -30,14 +30,6 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(NUM_ENCOUNTER);
-
-                _kurinaxxGUID   = 0;
-                _rajaxxGUID     = 0;
-                _moamGUID       = 0;
-                _buruGUID       = 0;
-                _ayamissGUID    = 0;
-                _ossirianGUID   = 0;
-                _paralyzedGUID  = 0;
             }
 
             void OnCreatureCreate(Creature* creature) override
@@ -99,17 +91,17 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript
                         return _paralyzedGUID;
                 }
 
-                return 0;
+                return ObjectGuid::Empty;
             }
 
         private:
-            uint64 _kurinaxxGUID;
-            uint64 _rajaxxGUID;
-            uint64 _moamGUID;
-            uint64 _buruGUID;
-            uint64 _ayamissGUID;
-            uint64 _ossirianGUID;
-            uint64 _paralyzedGUID;
+            ObjectGuid _kurinaxxGUID;
+            ObjectGuid _rajaxxGUID;
+            ObjectGuid _moamGUID;
+            ObjectGuid _buruGUID;
+            ObjectGuid _ayamissGUID;
+            ObjectGuid _ossirianGUID;
+            ObjectGuid _paralyzedGUID;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
index 01572793651..456ff749e84 100644
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
@@ -45,12 +45,12 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript
             bool IsBossDied[3];
 
             //Storing Skeram, Vem and Kri.
-            uint64 SkeramGUID;
-            uint64 VemGUID;
-            uint64 KriGUID;
-            uint64 VeklorGUID;
-            uint64 VeknilashGUID;
-            uint64 ViscidusGUID;
+            ObjectGuid SkeramGUID;
+            ObjectGuid VemGUID;
+            ObjectGuid KriGUID;
+            ObjectGuid VeklorGUID;
+            ObjectGuid VeknilashGUID;
+            ObjectGuid ViscidusGUID;
 
             uint32 BugTrioDeathCount;
 
@@ -63,13 +63,6 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript
                 IsBossDied[1] = false;
                 IsBossDied[2] = false;
 
-                SkeramGUID = 0;
-                VemGUID = 0;
-                KriGUID = 0;
-                VeklorGUID = 0;
-                VeknilashGUID = 0;
-                ViscidusGUID = 0;
-
                 BugTrioDeathCount = 0;
 
                 CthunPhase = 0;
@@ -151,7 +144,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript
                 case DATA_VISCIDUS:
                     return ViscidusGUID;
                 }
-                return 0;
+                return ObjectGuid::Empty;
             }                                                       // end GetGuidData
 
             void SetData(uint32 type, uint32 data) override
diff --git a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
index f46936bd2cc..5d7202588a9 100644
--- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
@@ -46,7 +46,7 @@ public:
         uint32 m_auiEncounter[MAX_ENCOUNTER];
 
         bool yelled;
-        uint64 NaralexGUID;
+        ObjectGuid NaralexGUID;
 
         void Initialize() override
         {
@@ -54,7 +54,6 @@ public:
             memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
 
             yelled = false;
-            NaralexGUID = 0;
         }
 
         void OnCreatureCreate(Creature* creature) override
@@ -102,7 +101,7 @@ public:
         ObjectGuid GetGuidData(uint32 data) const override
         {
             if (data == DATA_NARALEX)return NaralexGUID;
-            return 0;
+            return ObjectGuid::Empty;
         }
 
         std::string GetSaveData() override
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index 113301feb30..393028e0446 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -111,13 +111,13 @@ public:
         instance_zulfarrak_InstanceMapScript(Map* map) : InstanceScript(map) { }
 
         uint32 GahzRillaEncounter;
-        uint64 ZumrahGUID;
-        uint64 BlyGUID;
-        uint64 WeegliGUID;
-        uint64 OroGUID;
-        uint64 RavenGUID;
-        uint64 MurtaGUID;
-        uint64 EndDoorGUID;
+        ObjectGuid ZumrahGUID;
+        ObjectGuid BlyGUID;
+        ObjectGuid WeegliGUID;
+        ObjectGuid OroGUID;
+        ObjectGuid RavenGUID;
+        ObjectGuid MurtaGUID;
+        ObjectGuid EndDoorGUID;
         uint32 PyramidPhase;
         uint32 major_wave_Timer;
         uint32 minor_wave_Timer;
@@ -127,14 +127,6 @@ public:
         void Initialize() override
         {
             SetHeaders(DataHeader);
-            GahzRillaEncounter = NOT_STARTED;
-            ZumrahGUID = 0;
-            BlyGUID = 0;
-            WeegliGUID = 0;
-            OroGUID = 0;
-            RavenGUID = 0;
-            MurtaGUID = 0;
-            EndDoorGUID = 0;
             PyramidPhase = 0;
             major_wave_Timer = 0;
             minor_wave_Timer = 0;
@@ -217,7 +209,7 @@ public:
                 case GO_END_DOOR:
                     return EndDoorGUID;
             }
-            return 0;
+            return ObjectGuid::Empty;
         }
 
         void SetData(uint32 type, uint32 data) override
@@ -315,7 +307,7 @@ public:
             };
         }
 
-        std::list<uint64> addsAtBase, movedadds;
+        GuidList addsAtBase, movedadds;
 
         void MoveNPCIfAlive(uint32 entry, float x, float y, float z, float o)
         {
@@ -346,7 +338,7 @@ public:
 
         bool IsWaveAllDead()
         {
-            for (std::list<uint64>::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr)
+            for (GuidList::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr)
             {
                 if (Creature* add = instance->GetCreature((*itr)))
                 {
@@ -354,7 +346,7 @@ public:
                         return false;
                 }
             }
-            for (std::list<uint64>::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr)
+            for (GuidList::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr)
             {
                 if (Creature* add = instance->GetCreature(((*itr))))
                 {