From 92769d3ffeda9fbdd12760e453bc99320565ca98 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Wed, 12 Aug 2009 23:12:33 -0500
Subject: *first remove corpse from world then resetmap

--HG--
branch : trunk
---
 src/game/Object.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 87922808179..3b451bbbc51 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -1717,7 +1717,7 @@ void WorldObject::SetMap(Map * map)
 void WorldObject::ResetMap()
 {
     ASSERT(m_currMap);
-    ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
+    ASSERT(!IsInWorld());
     if(m_isWorldObject)
         m_currMap->RemoveWorldObject(this);
     m_currMap = NULL;
-- 
cgit v1.2.3