*Fix a crash caused by corpses.

--HG-- branch : trunk
2009-08-12 15:33:12 -05:00
parent c1daf6567c
commit 24c8931ae9
1 changed files with 7 additions and 1 deletions
@@ -61,7 +61,13 @@ Map::~Map()
    UnloadAll();

    while(!i_worldObjects.empty())
-        (*(i_worldObjects.begin()))->ResetMap();
+    {
+        WorldObject *obj = *i_worldObjects.begin();
+        assert(obj->m_isWorldObject);
+        //assert(obj->GetTypeId() == TYPEID_CORPSE);
+        obj->ResetMap();
+        obj->RemoveFromWorld();
+    }

    if(!m_scriptSchedule.empty())
        sWorld.DecreaseScheduledScriptCount(m_scriptSchedule.size());