Changeset 7368 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Apr 25, 2006, 11:37:59 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: some renamings, and GameWorldData now has lists for what EntityLists should be drawed/ticked/collided(not yet implemented).

File:

• trunk/src/world_entities/projectiles/bomb.cc (modified) (1 diff)

trunk/src/world_entities/projectiles/bomb.cc

@@ -183 +183 @@
 void Bomb::detonate(float size)
 {
-  std::list<WorldEntity*>* detonationList = ObjectManager::distanceFromObject(*this, size, CL_NPC);
-  if (detonationList != NULL)
-  {
-    while( !detonationList->empty() )
+  ObjectManager::EntityList detonationList;
+  ObjectManager::distanceFromObject(detonationList, *this, size, CL_NPC);
+    while( !detonationList.empty() )
     {
-      detonationList->front()->collidesWith(this, Vector(0,0,0));
-      detonationList->pop_front();
+      detonationList.front()->collidesWith(this, Vector(0,0,0));
+      detonationList.pop_front();
     }
-    delete detonationList;
-  }
 }