Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 00:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Add some asserts back.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-08-11 16:39:35 -05:00
parent 962b88a381
commit 0f18e49052
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/Object.cpp
View File

@@ -1704,7 +1704,7 @@ void WorldObject::SendObjectDeSpawnAnim(uint64 guid)
void WorldObject::SetMap(Map * map)
{
ASSERT(map);
//ASSERT(!IsInWorld());
ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
ASSERT(!m_currMap);
m_currMap = map;
if(m_isWorldObject)
@@ -1714,7 +1714,7 @@ void WorldObject::SetMap(Map * map)
void WorldObject::ResetMap()
{
ASSERT(m_currMap);
//ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
ASSERT(!IsInWorld() || GetTypeId() == TYPEID_CORPSE);
if(m_isWorldObject)
m_currMap->RemoveWorldObject(this);
m_currMap = NULL;