aboutsummaryrefslogtreecommitdiff
path: root/src/game/Object.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-08-12 23:12:33 -0500
committermegamage <none@none>2009-08-12 23:12:33 -0500
commit92769d3ffeda9fbdd12760e453bc99320565ca98 (patch)
tree7ab64f32642499c44f14112ef603d150587932ec /src/game/Object.cpp
parent24f906cfc096befc3c6cc95d01f1d91d565f3971 (diff)
*first remove corpse from world then resetmap
--HG-- branch : trunk
Diffstat (limited to 'src/game/Object.cpp')
-rw-r--r--src/game/Object.cpp2
1 files changed, 1 insertions, 1 deletions
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;