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/game/Maps/MapScripts.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/game/Maps/MapScripts.cpp') diff --git a/src/server/game/Maps/MapScripts.cpp b/src/server/game/Maps/MapScripts.cpp index 9972c3f4a29..d8bb33c74bf 100644 --- a/src/server/game/Maps/MapScripts.cpp +++ b/src/server/game/Maps/MapScripts.cpp @@ -322,7 +322,7 @@ void Map::ScriptsProcess() ScriptAction const& step = iter->second; Object* source = nullptr; - if (step.sourceGUID) + if (!step.sourceGUID.IsEmpty()) { switch (step.sourceGUID.GetHigh()) { @@ -358,7 +358,7 @@ void Map::ScriptsProcess() } WorldObject* target = nullptr; - if (step.targetGUID) + if (!step.targetGUID.IsEmpty()) { switch (step.targetGUID.GetHigh()) { -- cgit v1.2.3