Changeset 10114 in orxonox.OLD for trunk/src/world_entities/projectiles/rail_projectile.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/projectiles/rail_projectile.cc (modified) (2 diffs)

trunk/src/world_entities/projectiles/rail_projectile.cc

@@ -28 +28 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
+
+ObjectListDefinition(RailProjectile);
 CREATE_FAST_FACTORY_STATIC(RailProjectile);
 
@@ -106 +106 @@
 void RailProjectile::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  if (this->hitEntity != entity && entity->isA(CL_NPC))
+  if (this->hitEntity != entity && entity->isA( "NPC" ))
     this->destroy( entity );
   this->hitEntity = entity;