Changeset 4979 in orxonox.OLD for orxonox/trunk/src/util/garbage_collector.cc

Timestamp:

Aug 10, 2005, 4:47:23 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: Objects now get cleanly ereased.
This is a fix in the Weapon-class, that kills the Resurected Projectiles created for information-gathering

File:

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

orxonox/trunk/src/util/garbage_collector.cc

@@ -25 +25 @@
 
 using namespace std;
-
 
 GarbageCollector* GarbageCollector::singletonRef = 0;
@@ -119 +118 @@
 void GarbageCollector::update()
 {
-  if (this->time < this->delay)
-  {
-    return;
-  }
-  if (this->collectedObjects == NULL)
+  if (this->time < this->delay || this->collectedObjects == NULL)
     return;
   else
@@ -131 +126 @@
     while (tmpC != NULL)
     {
-      WorldEntity* entity = dynamic_cast<WorldEntity*>(tmpC->objectPointer);
+      //WorldEntity* entity = dynamic_cast<WorldEntity*>(tmpC->objectPointer);
       //State::getWorldEntityList()->remove(entity);
-      entity->remove();
-      FastFactory::kill(entity, true);
+      //entity->remove();
+      FastFactory::kill(tmpC->objectPointer, true);
 
       moveC = tmpC->next;