Changeset 5968 in orxonox.OLD for branches/network/src/world_entities/power_ups

Timestamp:

Dec 7, 2005, 4:16:51 PM (19 years ago)

Author:

patrick

Message:

network: merged the trunk into the network with the command svn merge -r5824:HEAD ../trunk network, changes changed… bla bla..

Location:

branches/network/src/world_entities/power_ups

Files:

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

branches/network/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);
 }

branches/network/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);
 }