From 227cd4d9936c3367b55691d7136d3d862dec6d38 Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Thu, 3 Jun 2010 15:14:21 +0200 Subject: [PATCH] Fix crash in SCRIPT_COMMAND_QUEST_EXPLORED, fixes issue #2532 --HG-- branch : trunk --- src/game/Map.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/game/Map.cpp b/src/game/Map.cpp index f28a45391d9..d6ef225f57d 100644 --- a/src/game/Map.cpp +++ b/src/game/Map.cpp @@ -3445,7 +3445,8 @@ void Map::ScriptsProcess() WorldObject* worldObject; Player* pTarget; - if (pTarget = target->ToPlayer()) + pTarget = target->ToPlayer(); + if (pTarget) { if (source->GetTypeId() != TYPEID_UNIT && source->GetTypeId() != TYPEID_GAMEOBJECT && source->GetTypeId() != TYPEID_PLAYER) { @@ -3465,7 +3466,8 @@ void Map::ScriptsProcess() break; } - if (!source->ToPlayer()) + pTarget = source->ToPlayer(); + if (!pTarget) { sLog.outError("SCRIPT_COMMAND_QUEST_EXPLORED (script id %u) call for non-player (TypeId: %u), skipping.", step.script->id, source->GetTypeId()); break;