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

Timestamp:

Dec 4, 2005, 3:34:36 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches/spaceshipControll back to the trunk:
merged with command:
svn merge -r5835:HEAD branches/spaceshipcontroll trunk
conflicts resolved with dynamic indentation methodology algorithms

Location:

trunk/src/world_entities/power_ups

Files:

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

trunk/src/world_entities/power_ups/laser_power_up.cc

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

trunk/src/world_entities/power_ups/turret_power_up.cc

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