Changeset 4301 in orxonox.OLD for orxonox/branches/physics/src/util/garbage_collector.cc

Timestamp:

May 26, 2005, 3:20:55 PM (20 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -4 4283:HEAD ../../trunk/ .
no conflicts

File:

• orxonox/branches/physics/src/util/garbage_collector.cc (modified) (2 diffs)

orxonox/branches/physics/src/util/garbage_collector.cc

@@ -25 +25 @@
 
 #include "list.h"
+#include "object_manager.h"
 
 using namespace std;
@@ -137 +138 @@
           entity->remove();
           /* then finaly delete reference */
-          delete entity;
+          //delete entity;
+          ObjectManager::getInstance()->addToDeadList(CL_TEST_BULLET, entity);
+          ObjectManager::getInstance()->debug();
         }
       entity = iterator->nextElement();