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

Timestamp:

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

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/world_entities/power_ups

Files:

• laser_power_up.cc (modified) (2 diffs)
• param_power_up.cc (modified) (1 diff)
• turret_power_up.cc (modified) (2 diffs)
• weapon_power_up.cc (modified) (1 diff)

trunk/src/world_entities/power_ups/laser_power_up.cc

@@ -24 +24 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
+
+ObjectListDefinition(LaserPowerUp);
 CREATE_FACTORY(LaserPowerUp);
 
@@ -80 +80 @@
 {
  // 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);
 }

trunk/src/world_entities/power_ups/param_power_up.cc

@@ -27 +27 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
+
+ObjectListDefinition(ParamPowerUp);
 CREATE_FACTORY(ParamPowerUp);
 

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);
 }

trunk/src/world_entities/power_ups/weapon_power_up.cc

@@ -27 +27 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
+
+ObjectListDefinition(WeaponPowerUp);
 CREATE_FACTORY(WeaponPowerUp);