aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMachiavelli <none@none>2010-06-03 15:14:21 +0200
committerMachiavelli <none@none>2010-06-03 15:14:21 +0200
commit227cd4d9936c3367b55691d7136d3d862dec6d38 (patch)
treef3bc342fa9d1aa8de3b58ffe6562dfcf4bfcd8f4 /src
parentdb293e41f966e96ab554a73c0fb803562f0a2f8d (diff)
Fix crash in SCRIPT_COMMAND_QUEST_EXPLORED, fixes issue #2532
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Map.cpp6
1 files 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;