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

Timestamp:

May 27, 2005, 7:14:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to the physics-branche
merged with command:
svn merge -r 4301:HEAD trunk/ branches/physics/
little conflict in particle-system resolved easily

File:

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

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

@@ -38 +38 @@
 GarbageCollector::GarbageCollector () 
 {
-   this->setClassName ("GarbageCollection");
+   this->setClassID(CL_GARBAGE_COLLECTOR, "GarbageCollector");
    this->time = 0;
    this->delay = 1.5f; /* clean up all 5.0 seconds */
@@ -139 +139 @@
           /* then finaly delete reference */
           //delete entity;
-          ObjectManager::getInstance()->addToDeadList(CL_TEST_BULLET, entity);
-          ObjectManager::getInstance()->debug();
+          ObjectManager::getInstance()->addToDeadList(entity->getClassID(), entity);
         }
       entity = iterator->nextElement();
@@ -148 +147 @@
   PRINTF(3)("=============================\n");
 
+  ObjectManager::getInstance()->debug();
+
   /* reset time to count again up to this->delay */
   this->time = 0;