Changeset 10114 in orxonox.OLD for trunk/src/world_entities/power_ups/turret_power_up.cc

Timestamp:

Dec 19, 2006, 11:55:26 PM (17 years ago)

Author:

patrick

Message:

merged network back to trunk

File:

• trunk/src/world_entities/power_ups/turret_power_up.cc (modified) (2 diffs)

trunk/src/world_entities/power_ups/turret_power_up.cc

@@ -24 +24 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
+
+ObjectListDefinition(TurretPowerUp);
 CREATE_FACTORY(TurretPowerUp);
 
@@ -76 +76 @@
 {
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
- if (entity->isA(CL_PLAYABLE))
+  if (entity->isA(Playable::staticClassID()))
    this->toList(OM_DEAD);
 }