diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-09-28 21:38:32 +0200 |
| commit | d144724e2fd8a74a3e896751dc9c866b3932f815 (patch) | |
| tree | e1f3c155560705bbd0f7dea15351b14602354454 /src/server/scripts/Kalimdor | |
| parent | 3059fcd70a01bccdf8ea6dd1ae7bedefd737d558 (diff) | |
Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64
(cherry picked from commit 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef)
Diffstat (limited to 'src/server/scripts/Kalimdor')
4 files changed, 5 insertions, 5 deletions
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp index b60826b64c1..ebb2495d95b 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjalAI.cpp @@ -939,7 +939,7 @@ void hyjalAI::WaypointReached(uint32 waypointId, uint32 /*pathId*/) TeleportTimer = 20000; if (me->GetEntry() == JAINA) DoCast(me, SPELL_MASS_TELEPORT, false); - if (me->GetEntry() == THRALL && DummyGuid) + if (me->GetEntry() == THRALL && !DummyGuid.IsEmpty()) { if (Creature* creature = ObjectAccessor::GetCreature(*me, DummyGuid)) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp index 5eda5bcbd93..7497a5b3318 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/boss_cthun.cpp @@ -757,7 +757,7 @@ public: StomachEnterTimer = 13800; } else StomachEnterTimer -= diff; - if (StomachEnterVisTimer && StomachEnterTarget) + if (StomachEnterVisTimer && !StomachEnterTarget.IsEmpty()) { if (StomachEnterVisTimer <= diff) { diff --git a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp index f6af15361ac..a7c085ee9ad 100644 --- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp +++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/mob_anubisath_sentinel.cpp @@ -124,7 +124,7 @@ public: { aqsentinelAI* cai = ENSURE_AI(aqsentinelAI, (c)->AI()); for (int32 i = 0; i < 3; ++i) - if (NearbyGUID[i] && NearbyGUID[i] != c->GetGUID()) + if (!NearbyGUID[i].IsEmpty() && NearbyGUID[i] != c->GetGUID()) cai->AddBuddyToList(NearbyGUID[i]); cai->AddBuddyToList(me->GetGUID()); } diff --git a/src/server/scripts/Kalimdor/zone_the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index 798ee849699..3019c728530 100644 --- a/src/server/scripts/Kalimdor/zone_the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp @@ -413,7 +413,7 @@ public: if (WaveTimer <= diff) { - if (Wave < 6 && AffrayChallenger[Wave] && !EventBigWill) + if (Wave < 6 && !AffrayChallenger[Wave].IsEmpty() && !EventBigWill) { Talk(SAY_TWIGGY_FLATHEAD_FRAY); Creature* creature = ObjectAccessor::GetCreature(*me, AffrayChallenger[Wave]); @@ -441,7 +441,7 @@ public: WaveTimer = 1000; } } - else if (Wave >= 6 && EventBigWill && BigWill) + else if (Wave >= 6 && EventBigWill && !BigWill.IsEmpty()) { Creature* creature = ObjectAccessor::GetCreature(*me, BigWill); if (!creature || !creature->IsAlive()) |