From 75f036976410811d3c2629ddcddd279beb2dafb8 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 21 Oct 2014 20:27:00 +0200 Subject: Core/Entities: Second batch of removing implicit conversions of ObjectGuid to uint64 (cherry picked from commit 034561792ca9a07d719961ea842af2118428816f) --- src/server/scripts/Events/childrens_week.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/server/scripts/Events') diff --git a/src/server/scripts/Events/childrens_week.cpp b/src/server/scripts/Events/childrens_week.cpp index c283c3bd40e..8ad3f2e85ee 100644 --- a/src/server/scripts/Events/childrens_week.cpp +++ b/src/server/scripts/Events/childrens_week.cpp @@ -179,7 +179,7 @@ class npc_winterfin_playmate : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -286,7 +286,7 @@ class npc_snowfall_glade_playmate : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_WOLVAR); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -392,7 +392,7 @@ class npc_the_biggest_tree : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -487,7 +487,7 @@ class npc_high_oracle_soo_roo : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -583,7 +583,7 @@ class npc_elder_kekek : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_WOLVAR); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -697,7 +697,7 @@ class npc_the_etymidian : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } } @@ -819,14 +819,14 @@ class npc_alexstraza_the_lifebinder : public CreatureScript { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_ORACLE); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 1; } else if (player->GetQuestStatus(QUEST_THE_DRAGON_QUEEN_WOLVAR) == QUEST_STATUS_INCOMPLETE) { playerGUID = player->GetGUID(); orphanGUID = getOrphanGUID(player, ORPHAN_WOLVAR); - if (orphanGUID) + if (!orphanGUID.IsEmpty()) phase = 7; } } -- cgit v1.2.3