Core/Scripts: Fixed build zone_* scripts

15 files changed, 61 insertions, 67 deletions

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
index 64e26caf1f2..66ce5e93720 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.cpp
@@ -588,7 +588,7 @@ public:
             if (instance->GetData(TYPE_THRALL_EVENT) == IN_PROGRESS)
             {
                 instance->SetData(TYPE_THRALL_PART4, IN_PROGRESS);
-                if (instance->GetGuidData(DATA_EPOCH))
+                if (instance->GetGuidData(DATA_EPOCH).IsEmpty())
                      creature->SummonCreature(ENTRY_EPOCH, 2639.13f, 698.55f, 65.43f, 4.59f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 120000);
 
                 if (Creature* thrall = (ObjectAccessor::GetCreature(*creature, instance->GetGuidData(DATA_THRALL))))
diff --git a/src/server/scripts/Kalimdor/zone_azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp
index cec94617454..542e04a7dd5 100644
--- a/src/server/scripts/Kalimdor/zone_azshara.cpp
+++ b/src/server/scripts/Kalimdor/zone_azshara.cpp
@@ -314,7 +314,7 @@ public:
             MustDieTimer = 3000;
             CurrWP = 0;
 
-            PlayerGUID = 0;
+            PlayerGUID.Clear();
 
             MustDie = false;
             Escape = false;
@@ -453,7 +453,7 @@ public:
         }
 
     private:
-        uint64 PlayerGUID;
+        ObjectGuid PlayerGUID;
         uint32 SpellEscapeTimer;
         uint32 TeleportTimer;
         uint32 CheckTimer;
diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
index e6869dbf0f5..c6f4e9d0ee6 100644
--- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp
@@ -68,7 +68,7 @@ public:
 
         void Initialize()
         {
-            pCaster = 0;
+            pCaster.Clear();
 
             SayThanksTimer = 0;
             RunAwayTimer = 0;
@@ -77,7 +77,7 @@ public:
             CanSayHelp = true;
         }
 
-        uint64 pCaster;
+        ObjectGuid pCaster;
 
         uint32 SayThanksTimer;
         uint32 RunAwayTimer;
@@ -431,13 +431,13 @@ public:
 
         void Initialize()
         {
-            SparkGUID = 0;
+            SparkGUID.Clear();
             Step = 0;
             EventStarted = false;
             SayTimer = 0;
         }
 
-        uint64 SparkGUID;
+        ObjectGuid SparkGUID;
 
         uint8 Step;
         uint32 SayTimer;
@@ -528,7 +528,7 @@ public:
 
             for (std::list<Player*>::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                 if ((*itr)->GetQuestStatus(QUEST_TREES_COMPANY) == QUEST_STATUS_INCOMPLETE && (*itr)->HasAura(SPELL_TREE_DISGUISE))
-                    (*itr)->KilledMonsterCredit(NPC_SPARK, 0);
+                    (*itr)->KilledMonsterCredit(NPC_SPARK);
         }
 
         void DespawnNagaFlag(bool despawn)
@@ -687,7 +687,7 @@ class npc_stillpine_capitive : public CreatureScript
 
             void Initialize()
             {
-                _playerGUID = 0;
+                _playerGUID.Clear();
                 _movementComplete = false;
             }
 
@@ -737,7 +737,7 @@ class npc_stillpine_capitive : public CreatureScript
             }
 
         private:
-            uint64 _playerGUID;
+            ObjectGuid _playerGUID;
             EventMap _events;
             bool _movementComplete;
         };
diff --git a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
index 81a175b57b7..5e2f4519b1e 100644
--- a/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
+++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
@@ -64,7 +64,7 @@ public:
             {
                 case 0:
                     if (Player* player = killer->ToPlayer())
-                        player->KilledMonsterCredit(NPC_EXPEDITION_RESEARCHER, 0);
+                        player->KilledMonsterCredit(NPC_EXPEDITION_RESEARCHER);
                     break;
                 case 1:
                 case 2:
diff --git a/src/server/scripts/Kalimdor/zone_desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp
index 0a56253cabd..7247286388a 100644
--- a/src/server/scripts/Kalimdor/zone_desolace.cpp
+++ b/src/server/scripts/Kalimdor/zone_desolace.cpp
@@ -103,7 +103,7 @@ public:
     {
         if (player->HasAura(SPELL_KODO_KOMBO_PLAYER_BUFF) && creature->HasAura(SPELL_KODO_KOMBO_DESPAWN_BUFF))
         {
-            player->TalkedToCreature(creature->GetEntry(), 0);
+            player->TalkedToCreature(creature->GetEntry(), ObjectGuid::Empty);
             player->RemoveAurasDueToSpell(SPELL_KODO_KOMBO_PLAYER_BUFF);
         }
 
diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp
index e2f8dd0854d..d0bda5d73cb 100644
--- a/src/server/scripts/Kalimdor/zone_durotar.cpp
+++ b/src/server/scripts/Kalimdor/zone_durotar.cpp
@@ -242,8 +242,7 @@ class npc_tiger_matriarch : public CreatureScript
 
         struct npc_tiger_matriarchAI : public ScriptedAI
         {
-            npc_tiger_matriarchAI(Creature* creature) : ScriptedAI(creature),
-                _tigerGuid(0)
+            npc_tiger_matriarchAI(Creature* creature) : ScriptedAI(creature)
             {
             }
 
@@ -343,7 +342,7 @@ class npc_tiger_matriarch : public CreatureScript
 
         private:
             EventMap _events;
-            uint64 _tigerGuid;
+            ObjectGuid _tigerGuid;
         };
 
         CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
index ee244e51b09..9f5e7bdf29d 100644
--- a/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
@@ -655,7 +655,7 @@ public:
         if (Creature* prisoner = go->FindNearestCreature(NPC_THERAMORE_PRISONER, 1.0f))
         {
             if (player)
-                player->KilledMonsterCredit(NPC_THERAMORE_PRISONER, 0);
+                player->KilledMonsterCredit(NPC_THERAMORE_PRISONER);
 
             prisoner->AI()->Talk(SAY_FREE); // We also emote cry here (handled in creature_text.emote)
             prisoner->DespawnOrUnsummon(6000);
diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp
index 268db8da779..c8d880e66b7 100644
--- a/src/server/scripts/Kalimdor/zone_moonglade.cpp
+++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp
@@ -299,7 +299,7 @@ public:
         npc_clintar_spiritAI(Creature* creature) : npc_escortAI(creature)
         {
             Initialize();
-            PlayerGUID = 0;
+            PlayerGUID.Clear();
         }
 
         void Initialize()
@@ -307,7 +307,7 @@ public:
             Step = 0;
             CurrWP = 0;
             EventTimer = 0;
-            PlayerGUID = 0;
+            PlayerGUID.Clear();
             checkPlayerTimer = 1000;
             EventOnWait = false;
         }
@@ -317,7 +317,7 @@ public:
         uint32 EventTimer;
         uint32 checkPlayerTimer;
 
-        uint64 PlayerGUID;
+        ObjectGuid PlayerGUID;
 
         bool EventOnWait;
 
@@ -358,7 +358,7 @@ public:
             if (player && player->GetQuestStatus(10965) == QUEST_STATUS_INCOMPLETE)
             {
                 player->FailQuest(10965);
-                PlayerGUID = 0;
+                PlayerGUID.Clear();
                 Reset();
             }
         }
@@ -536,7 +536,7 @@ public:
                                 break;
                             case 2:
                                 player->TalkedToCreature(me->GetEntry(), me->GetGUID());
-                                PlayerGUID = 0;
+                                PlayerGUID.Clear();
                                 Reset();
                                 me->setDeathState(JUST_DIED);
                                 break;
diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp
index 289d7282ac6..31f3dffe70a 100644
--- a/src/server/scripts/Kalimdor/zone_mulgore.cpp
+++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp
@@ -71,14 +71,14 @@ public:
         {
             EventActive = false;
             IsMovingToLunch = false;
-            PlayerGUID = 0;
+            PlayerGUID.Clear();
             EventTimer = 5000;
             EventPhase = 0;
         }
 
         bool EventActive;
         bool IsMovingToLunch;
-        uint64 PlayerGUID;
+        ObjectGuid PlayerGUID;
         uint32 EventTimer;
         uint8 EventPhase;
 
diff --git a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
index fd666b7fcd7..6097937f9d5 100644
--- a/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
+++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp
@@ -75,14 +75,14 @@ public:
             CanEmote = false;
             SaluteTimer = 6000;
             ResetTimer = 0;
-            PlayerGUID = 0;
+            PlayerGUID.Clear();
         }
 
         bool CanTalk;
         bool CanEmote;
         uint32 SaluteTimer;
         uint32 ResetTimer;
-        uint64 PlayerGUID;
+        ObjectGuid PlayerGUID;
 
         void Reset() override
         {
diff --git a/src/server/scripts/Kalimdor/zone_silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp
index 55f36779145..c977f1aee52 100644
--- a/src/server/scripts/Kalimdor/zone_silithus.cpp
+++ b/src/server/scripts/Kalimdor/zone_silithus.cpp
@@ -97,7 +97,7 @@ public:
             case GOSSIP_ACTION_INFO_DEF + 6:
                 player->SEND_GOSSIP_MENU(7761, creature->GetGUID());
                                                                 //'kill' our trigger to update quest status
-                player->KilledMonsterCredit(TRIGGER_RUTGAR, 0);
+                player->KilledMonsterCredit(TRIGGER_RUTGAR);
                 break;
 
             case GOSSIP_ACTION_INFO_DEF + 9:
@@ -123,7 +123,7 @@ public:
             case GOSSIP_ACTION_INFO_DEF + 14:
                 player->SEND_GOSSIP_MENU(7767, creature->GetGUID());
                                                                 //'kill' our trigger to update quest status
-                player->KilledMonsterCredit(TRIGGER_FRANKAL, 0);
+                player->KilledMonsterCredit(TRIGGER_FRANKAL);
                 break;
         }
         return true;
@@ -431,24 +431,24 @@ public:
         {
             AnimationTimer = 1500;
             AnimationCount = 0;
-            AnachronosQuestTriggerGUID = 0;
-            MerithraGUID = 0;
-            ArygosGUID = 0;
-            CaelestraszGUID = 0;
-            FandralGUID = 0;
-            PlayerGUID = 0;
+            AnachronosQuestTriggerGUID.Clear();
+            MerithraGUID.Clear();
+            ArygosGUID.Clear();
+            CaelestraszGUID.Clear();
+            FandralGUID.Clear();
+            PlayerGUID.Clear();
             eventEnd = false;
         }
 
         uint32 AnimationTimer;
         uint8 AnimationCount;
 
-        uint64 AnachronosQuestTriggerGUID;
-        uint64 MerithraGUID;
-        uint64 ArygosGUID;
-        uint64 CaelestraszGUID;
-        uint64 FandralGUID;
-        uint64 PlayerGUID;
+        ObjectGuid AnachronosQuestTriggerGUID;
+        ObjectGuid MerithraGUID;
+        ObjectGuid ArygosGUID;
+        ObjectGuid CaelestraszGUID;
+        ObjectGuid FandralGUID;
+        ObjectGuid PlayerGUID;
         bool eventEnd;
 
         void Reset() override
@@ -485,7 +485,7 @@ public:
                         Fandral->AI()->Talk(FANDRAL_SAY_1, me);
                         break;
                     case 2:
-                        Fandral->SetTarget(0);
+                        Fandral->SetTarget(ObjectGuid::Empty);
                         Merithra->AI()->Talk(MERITHRA_EMOTE_1);
                         break;
                     case 3:
@@ -502,7 +502,7 @@ public:
                         Merithra->AI()->Talk(MERITHRA_SAY_2);
                         break;
                     case 7:
-                        Caelestrasz->SetTarget(0);
+                        Caelestrasz->SetTarget(ObjectGuid::Empty);
                         Merithra->GetMotionMaster()->MoveCharge(-8065, 1530, 2.61f, 10);
                         break;
                     case 8:
@@ -769,14 +769,14 @@ public:
 
         void Initialize()
         {
-            MobGUID = 0;
-            PlayerGUID = 0;
+            MobGUID.Clear();
+            PlayerGUID.Clear();
             Timers = false;
             hasTarget = false;
         }
 
-        uint64 MobGUID;
-        uint64 PlayerGUID;
+        ObjectGuid MobGUID;
+        ObjectGuid PlayerGUID;
         uint32 SpellTimer1, SpellTimer2, SpellTimer3, SpellTimer4;
         bool Timers;
         bool hasTarget;
@@ -890,7 +890,7 @@ public:
 
         void Initialize()
         {
-            PlayerGUID = 0;
+            PlayerGUID.Clear();
 
             WaveTimer = 2000;
             AnnounceTimer = 1000;
@@ -902,7 +902,7 @@ public:
             Failed = false;
         }
 
-        uint64 PlayerGUID;
+        ObjectGuid PlayerGUID;
 
         uint32 WaveTimer;
         uint32 AnnounceTimer;
diff --git a/src/server/scripts/Kalimdor/zone_tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp
index fce0608faaf..ec2fa7b398e 100644
--- a/src/server/scripts/Kalimdor/zone_tanaris.cpp
+++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp
@@ -546,14 +546,14 @@ public:
             PostEventTimer = 1000;
             PhasePostEvent = 0;
 
-            TortaGUID = 0;
+            TortaGUID.Clear();
         }
 
         uint32 CheckSpeechTimer;
         uint32 PostEventTimer;
         uint32 PhasePostEvent;
 
-        uint64 TortaGUID;
+        ObjectGuid TortaGUID;
 
         void Reset() override
         {
diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
index 03507c77efb..535253222e0 100644
--- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp
@@ -333,14 +333,14 @@ public:
             WaveTimer = 600000;
             ChallengerChecker = 0;
             Wave = 0;
-            PlayerGUID = 0;
+            PlayerGUID.Clear();
 
             for (uint8 i = 0; i < 6; ++i)
             {
-                AffrayChallenger[i] = 0;
+                AffrayChallenger[i].Clear();
                 ChallengerDown[i] = false;
             }
-            BigWill = 0;
+            BigWill.Clear();
         }
 
         bool EventInProgress;
@@ -350,9 +350,9 @@ public:
         uint8 Wave;
         uint32 WaveTimer;
         uint32 ChallengerChecker;
-        uint64 PlayerGUID;
-        uint64 AffrayChallenger[6];
-        uint64 BigWill;
+        ObjectGuid PlayerGUID;
+        ObjectGuid AffrayChallenger[6];
+        ObjectGuid BigWill;
 
         void Reset() override
         {
diff --git a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
index ea4c743b8a5..9596f8a04f6 100644
--- a/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
@@ -212,14 +212,14 @@ public:
             FaintTimer = urand(30000, 60000);
             EndEventProgress = 0;
             EndEventTimer = 1000;
-            SpraggleGUID = 0;
+            SpraggleGUID.Clear();
         }
 
         uint32 FaintTimer;
         uint32 EndEventProgress;
         uint32 EndEventTimer;
 
-        uint64 SpraggleGUID;
+        ObjectGuid SpraggleGUID;
 
         void Reset() override
         {
diff --git a/src/server/scripts/Kalimdor/zone_winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp
index 58d9b115398..ee73d9b27a9 100644
--- a/src/server/scripts/Kalimdor/zone_winterspring.cpp
+++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp
@@ -318,11 +318,6 @@ public:
             DialogueHelper(introDialogue)
         {
             Initialize();
-            _firstPriestessGUID = 0;
-            _secondPriestessGUID = 0;
-            _guardEluneGUID = 0;
-            _voiceEluneGUID = 0;
-            _altarGUID = 0;
         }
 
         void Initialize()
@@ -332,11 +327,11 @@ public:
 
         uint32 _delayTimer;
 
-        uint64 _firstPriestessGUID;
-        uint64 _secondPriestessGUID;
-        uint64 _guardEluneGUID;
-        uint64 _voiceEluneGUID;
-        uint64 _altarGUID;
+        ObjectGuid _firstPriestessGUID;
+        ObjectGuid _secondPriestessGUID;
+        ObjectGuid _guardEluneGUID;
+        ObjectGuid _voiceEluneGUID;
+        ObjectGuid _altarGUID;
 
         void Reset() override
         {