*first remove corpse from world then resetmap

--HG--
branch : trunk

src/game/Map.cpp

@@ -65,8 +65,8 @@ Map::~Map()
         WorldObject *obj = *i_worldObjects.begin();
         assert(obj->m_isWorldObject);
         //assert(obj->GetTypeId() == TYPEID_CORPSE);
-        obj->ResetMap();
         obj->RemoveFromWorld();
+        obj->ResetMap();
     }
 
     if(!m_scriptSchedule.empty())

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;