From 7eab6a791ae1c039de67a80ff8bd125bf69f7ba4 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 21 Oct 2014 21:09:15 +0200 Subject: Core/Entities: Final batch of removing implicit conversions of ObjectGuid to uint64 (cherry picked from commit 68f45e87345ff85341f835f0372f2a62b89f24d9) --- src/server/game/Instances/InstanceScript.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/server/game/Instances/InstanceScript.cpp') diff --git a/src/server/game/Instances/InstanceScript.cpp b/src/server/game/Instances/InstanceScript.cpp index 1435960d6e4..745e67c586c 100644 --- a/src/server/game/Instances/InstanceScript.cpp +++ b/src/server/game/Instances/InstanceScript.cpp @@ -638,7 +638,8 @@ void InstanceScript::DoRemoveAurasDueToSpellOnPlayer(Player* player, uint32 spel for (uint8 itr2 = 0; itr2 < MAX_SUMMON_SLOT; ++itr2) { - if (ObjectGuid summonGUID = player->m_SummonSlot[itr2]) + ObjectGuid summonGUID = player->m_SummonSlot[itr2]; + if (!summonGUID.IsEmpty()) if (Creature* summon = instance->GetCreature(summonGUID)) summon->RemoveAurasDueToSpell(spell); } @@ -673,7 +674,8 @@ void InstanceScript::DoCastSpellOnPlayer(Player* player, uint32 spell, bool incl for (uint8 itr2 = 0; itr2 < MAX_SUMMON_SLOT; ++itr2) { - if (ObjectGuid summonGUID = player->m_SummonSlot[itr2]) + ObjectGuid summonGUID = player->m_SummonSlot[itr2]; + if (!summonGUID.IsEmpty()) if (Creature* summon = instance->GetCreature(summonGUID)) summon->CastSpell(player, spell, true); } -- cgit v1.2.3