diff options
| -rw-r--r-- | src/game/Map.cpp | 2 | ||||
| -rw-r--r-- | src/game/Object.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp index c85272482e2..d2f1fe7c619 100644 --- a/src/game/Map.cpp +++ b/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()) 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; |