Changeset 10114 in orxonox.OLD for trunk/src/world_entities/power_ups
- Timestamp:
- Dec 19, 2006, 11:55:26 PM (18 years ago)
- Location:
- trunk/src/world_entities/power_ups
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/world_entities/power_ups/laser_power_up.cc
r9869 r10114 24 24 25 25 26 #include "class_id_DEPRECATED.h" 27 ObjectListDefinition ID(LaserPowerUp, CL_LASER_POWER_UP);26 27 ObjectListDefinition(LaserPowerUp); 28 28 CREATE_FACTORY(LaserPowerUp); 29 29 … … 80 80 { 81 81 // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z); 82 if (entity->isA(CL_PLAYABLE))82 if (entity->isA(Playable::staticClassID())) 83 83 this->toList(OM_DEAD); 84 84 } -
trunk/src/world_entities/power_ups/param_power_up.cc
r9869 r10114 27 27 28 28 29 #include "class_id_DEPRECATED.h" 30 ObjectListDefinition ID(ParamPowerUp, CL_PARAM_POWER_UP);29 30 ObjectListDefinition(ParamPowerUp); 31 31 CREATE_FACTORY(ParamPowerUp); 32 32 -
trunk/src/world_entities/power_ups/turret_power_up.cc
r9869 r10114 24 24 25 25 26 #include "class_id_DEPRECATED.h" 27 ObjectListDefinition ID(TurretPowerUp, CL_TURRET_POWER_UP);26 27 ObjectListDefinition(TurretPowerUp); 28 28 CREATE_FACTORY(TurretPowerUp); 29 29 … … 76 76 { 77 77 // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z); 78 if (entity->isA(CL_PLAYABLE))78 if (entity->isA(Playable::staticClassID())) 79 79 this->toList(OM_DEAD); 80 80 } -
trunk/src/world_entities/power_ups/weapon_power_up.cc
r9869 r10114 27 27 #include "debug.h" 28 28 29 #include "class_id_DEPRECATED.h" 30 ObjectListDefinition ID(WeaponPowerUp, CL_WEAPON_POWER_UP);29 30 ObjectListDefinition(WeaponPowerUp); 31 31 CREATE_FACTORY(WeaponPowerUp); 32 32
Note: See TracChangeset
for help on using the changeset viewer.