From a4978bb90a48547f7a2681d5626d7a01e3fb8f23 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 26 Aug 2009 19:35:20 -0500
Subject: *Add some crash log.

--HG--
branch : trunk
---
 src/game/Object.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/game/Object.cpp')

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();
-- 
cgit v1.2.3