*Update Object deconstruct check.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-09 17:15:40 -05:00
parent fc040ef111
commit 1694ab1f95
+2 -3
View File
@@ -85,17 +85,16 @@ Object::~Object( )
//if(m_objectUpdated) //if(m_objectUpdated)
// ObjectAccessor::Instance().RemoveUpdateObject(this); // ObjectAccessor::Instance().RemoveUpdateObject(this);
if(m_uint32Values)
{
if(IsInWorld()) if(IsInWorld())
{ {
///- Do NOT call RemoveFromWorld here, if the object is a player it will crash
sLog.outCrash("Object::~Object - guid="I64FMTD", typeid=%d deleted but still in world!!", GetGUID(), GetTypeId()); sLog.outCrash("Object::~Object - guid="I64FMTD", typeid=%d deleted but still in world!!", GetGUID(), GetTypeId());
assert(false); assert(false);
} }
assert(!m_objectUpdated); assert(!m_objectUpdated);
if(m_uint32Values)
{
//DEBUG_LOG("Object desctr 1 check (%p)",(void*)this); //DEBUG_LOG("Object desctr 1 check (%p)",(void*)this);
delete [] m_uint32Values; delete [] m_uint32Values;
delete [] m_uint32Values_mirror; delete [] m_uint32Values_mirror;