Changeset 325 for ps

Timestamp:

05/30/04 03:57:26 (21 years ago)

Author:

markt

Message:

Fixing leaks.

Location:

ps/trunk/source/simulation

Files:

• BaseEntity.cpp (modified) (2 diffs)
• BaseEntity.h (modified) (1 diff)
• BaseEntityCollection.cpp (modified) (1 diff)
• EntityManager.cpp (modified) (1 diff)

ps/trunk/source/simulation/BaseEntity.cpp

@@ -15 +15 @@
 // 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 )
@@ -127 +135 @@
 
         }
-
+        delete errorHandler;
         delete parser;
     }

ps/trunk/source/simulation/BaseEntity.h

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

ps/trunk/source/simulation/BaseEntityCollection.cpp

@@ -32 +32 @@
     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 );
-*/
 }
 

ps/trunk/source/simulation/EntityManager.cpp

@@ -10 +10 @@
 
 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 );
 }