Changeset 6142 in orxonox.OLD for trunk/src/world_entities/power_ups

Timestamp:

Dec 16, 2005, 7:13:57 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merge the ObjectManager to the trunk
merged with command:
svn merge -r6082:HEAD objectmanager/ ../trunk/

conflicts resolution was easy this time
but specially merged the world to network_world

Location:

trunk/src/world_entities/power_ups

Files:

• laser_power_up.cc (modified) (1 diff)
• power_up.cc (modified) (1 diff)
• turret_power_up.cc (modified) (1 diff)

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -80 +80 @@
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
  if (entity->isA(CL_PLAYABLE))
-  State::getWorldEntityList()->remove(this);
+  this->toList(OM_DEAD);
 }
 

trunk/src/world_entities/power_ups/power_up.cc

@@ -38 +38 @@
 {
   delete this->sphereMaterial;
+  this->toList(OM_COMMON);
 }
 

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -80 +80 @@
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
  if (entity->isA(CL_PLAYABLE))
-  State::getWorldEntityList()->remove(this);
+   this->toList(OM_DEAD);
 }