Fixing leaks.

This was SVN commit r325.
This commit is contained in:
MarkT 2004-05-30 01:57:26 +00:00
parent ae79855c8e
commit 04cef944e9
4 changed files with 14 additions and 13 deletions

View File

@ -15,6 +15,14 @@
// automatically use namespace ..
XERCES_CPP_NAMESPACE_USE
CBaseEntity::~CBaseEntity()
{
if( m_bound_box )
delete( m_bound_box );
if( m_bound_circle )
delete( m_bound_circle );
}
bool CBaseEntity::loadXML( CStr filename )
{
bool parseOK = false;
@ -126,7 +134,7 @@ bool CBaseEntity::loadXML( CStr filename )
}
}
delete errorHandler;
delete parser;
}
XMLPlatformUtils::Terminate();

View File

@ -28,6 +28,7 @@ class CBaseEntity
{
public:
CBaseEntity() { m_bound_circle = NULL; m_bound_box = NULL; }
~CBaseEntity();
// Load from XML
bool loadXML( CStr filename );

View File

@ -31,17 +31,6 @@ void CBaseEntityCollection::loadTemplates()
CBaseEntity* dude = getTemplate( "Prometheus Dude" );
dude->m_speed *= 10.0f;
/*
// Nasty evil wicked hardcoding.
CBaseEntity dude;
dude.m_name = CStr( "Prometheus Dude" );
dude.m_actorObject = g_ObjMan.FindObject( "The Dude" );
dude.m_actorObject->m_Model->GetAnimation()->m_FrameTime /= 3.0f;
dude.speed = 0.3f;
addTemplate( dude );
*/
}
void CBaseEntityCollection::addTemplate( CBaseEntity& temp )

View File

@ -11,6 +11,9 @@ CEntityManager::CEntityManager()
CEntityManager::~CEntityManager()
{
m_extant = false;
for( int i = 0; i < MAX_HANDLES; i++ )
if( m_entities[i].m_refcount )
delete( m_entities[i].m_entity );
}
HEntity CEntityManager::create( CBaseEntity* base, CVector3D position, float orientation )