aboutsummaryrefslogtreecommitdiff
path: root/src/game/Object.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-26 19:35:20 -0500
committermegamage <none@none>2009-08-26 19:35:20 -0500
commita4978bb90a48547f7a2681d5626d7a01e3fb8f23 (patch)
treec81b311c30b2cb3571e92339ff7edf2815608efd /src/game/Object.cpp
parent21af4cf832daeccb1617e37e15cd7b9bcebfb6c8 (diff)
*Add some crash log.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
-rw-r--r--src/game/Object.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 9af456989c7..d98784bc602 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1710,8 +1710,11 @@ void WorldObject::SetMap(Map * map)
ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
if(m_currMap == map) // command add npc: first create, than loadfromdb
return;
-
- ASSERT(!m_currMap);
+ if(m_currMap)
+ {
+ sLog.outCrash("WorldObject::SetMap: obj %u new map %u %u, old map %u %u", (uint32)GetTypeId(), map->GetId(), map->GetInstanceId(), m_currMap->GetId(), m_currMap->GetInstanceId());
+ assert(false);
+ }
m_currMap = map;
m_mapId = map->GetId();
m_InstanceId = map->GetInstanceId();