*A temp fix of the crashes caused by corpses.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-11 15:40:43 -05:00
parent 98a19f2125
commit 4267816fca
2 changed files with 6 additions and 2 deletions

View File

@@ -1692,14 +1692,14 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
void WorldObject::SetMap(Map * map)
{
ASSERT(map);
ASSERT(!IsInWorld());
ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
m_currMap = map;
}
void WorldObject::ResetMap()
{
ASSERT(m_currMap);
ASSERT(!IsInWorld());
ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
m_currMap = NULL;
}

View File

@@ -177,6 +177,10 @@ void LoadHelper(CellCorpseSet const& cell_corpses, CellPair &cell, CorpseMapType
if(!obj)
continue;
// TODO: this is a hack
// corpse's map should be reset when the map is unloaded
obj->SetMap(map);
AddObjectHelper(cell, m, count, map, obj);
}
}