*Add an assert in ~worldobject
--HG-- branch : trunk
This commit is contained in:
+1
-3
@@ -80,17 +80,15 @@ Object::Object( ) : m_PackGUID(sizeof(uint64)+1)
|
|||||||
m_PackGUID.appendPackGUID(0);
|
m_PackGUID.appendPackGUID(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
WorldObject::~WorldObject()
|
WorldObject::~WorldObject()
|
||||||
{
|
{
|
||||||
if(m_currMap)
|
if(m_isWorldObject && m_currMap)
|
||||||
{
|
{
|
||||||
sLog.outCrash("Object::~Object - guid="UI64FMTD", typeid=%d, entry=%u deleted but still in map!!", GetGUID(), GetTypeId(), GetEntry());
|
sLog.outCrash("Object::~Object - guid="UI64FMTD", typeid=%d, entry=%u deleted but still in map!!", GetGUID(), GetTypeId(), GetEntry());
|
||||||
assert(false);
|
assert(false);
|
||||||
ResetMap();
|
ResetMap();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
*/
|
|
||||||
|
|
||||||
Object::~Object( )
|
Object::~Object( )
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
@@ -367,7 +367,7 @@ class TRINITY_DLL_SPEC Object
|
|||||||
class TRINITY_DLL_SPEC WorldObject : public Object
|
class TRINITY_DLL_SPEC WorldObject : public Object
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
virtual ~WorldObject ( ) {}
|
virtual ~WorldObject();
|
||||||
|
|
||||||
virtual void Update ( uint32 /*time_diff*/ ) { }
|
virtual void Update ( uint32 /*time_diff*/ ) { }
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user