Changeset 4289 in orxonox.OLD for orxonox

Timestamp:

May 26, 2005, 12:49:50 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: now all unused projectiles are added to the dead list and not deleted anymore

Location:

orxonox/trunk/src

Files:

• util/garbage_collector.cc (modified) (2 diffs)
• util/object_manager.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/test_gun.cc (modified) (2 diffs)

orxonox/trunk/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();

orxonox/trunk/src/util/object_manager.cc

@@ -78 +78 @@
     this->managedObjectList[index]->add(object);
   else
-    PRINTF(0)(" Error: unable to add object to the list nr. %i, ignoring\n", index);
+    PRINTF(0)(" Error: unable to add object to the list nr. %i: no list initialized - ignoring\n", index);
 }
 
 
 BaseObject* ObjectManager::getFromDeadList(classList index, int number)
-{}
+{
+  if( likely(this->managedObjectList[index] != NULL))
+    {
+      BaseObject* obj = this->managedObjectList[index]->firstElement();
+      this->managedObjectList[index]->remove(obj);
+      return obj;
+    }
+  else
+    PRINTF(0)(" Error: unable to get object from the list nr. %i: no elements initialized - ignoring\n", index);
+}
 
 

orxonox/trunk/src/world_entities/player.cc

@@ -106 +106 @@
   this->weaponMan->addWeapon(wpRight, W_CONFIG2);
   this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
-
-  BaseObject* p = new Projectile(wpRight);
-  ObjectManager::getInstance()->cache(CL_PROJECTILE, 100, *p);
-  ObjectManager::getInstance()->debug();
-
 }
 

orxonox/trunk/src/world_entities/test_gun.cc

@@ -32 +32 @@
 #include "animation3d.h"
 
+#include "object_manager.h"
 
 using namespace std;
@@ -88 +89 @@
     }
 
+  BaseObject* p = new TestBullet(this);
+  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, *p);
+  ObjectManager::getInstance()->debug();
 }