diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2014-10-21 19:23:32 +0200 |
| commit | 9cc7044546eaaaf4fd7a999c5e074ad0ea3d47ef (patch) | |
| tree | e40c2f50a9b5b11620ee607103f0352521bdf54f /src/server/scripts/World | |
| parent | 1bea52fd4649b6a1761aa157f9e74f01e19872e7 (diff) | |
Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64
Diffstat (limited to 'src/server/scripts/World')
| -rw-r--r-- | src/server/scripts/World/guards.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/scripts/World/guards.cpp b/src/server/scripts/World/guards.cpp index 13d811f3ff1..ac0c50aa7dd 100644 --- a/src/server/scripts/World/guards.cpp +++ b/src/server/scripts/World/guards.cpp @@ -316,7 +316,7 @@ public: DoCast(temp, SPELL_BANISHED_SHATTRATH_A); banishTimer = 9000; playerGUID = temp->GetGUID(); - if (playerGUID) + if (!playerGUID.IsEmpty()) canTeleport = true; } } else banishTimer -= diff; @@ -389,7 +389,7 @@ public: DoCast(temp, SPELL_BANISHED_SHATTRATH_S); banishTimer = 9000; playerGUID = temp->GetGUID(); - if (playerGUID) + if (!playerGUID.IsEmpty()) canTeleport = true; } } else banishTimer -= diff; diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index e733f5581f9..f7c09fa21b9 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -790,7 +790,7 @@ public: return; if (player->GetQuestStatus(6624) == QUEST_STATUS_INCOMPLETE || player->GetQuestStatus(6622) == QUEST_STATUS_INCOMPLETE) - if (DoctorGUID) + if (!DoctorGUID.IsEmpty()) if (Creature* doctor = ObjectAccessor::GetCreature(*me, DoctorGUID)) ENSURE_AI(npc_doctor::npc_doctorAI, doctor->AI())->PatientSaved(me, player, Coord); @@ -836,7 +836,7 @@ public: me->setDeathState(JUST_DIED); me->SetFlag(UNIT_DYNAMIC_FLAGS, 32); - if (DoctorGUID) + if (!DoctorGUID.IsEmpty()) if (Creature* doctor = ObjectAccessor::GetCreature((*me), DoctorGUID)) ENSURE_AI(npc_doctor::npc_doctorAI, doctor->AI())->PatientDied(Coord); } |