Changeset 9926 in orxonox.OLD for branches/network/src/world_entities

Timestamp:

Nov 9, 2006, 7:41:00 PM (18 years ago)

Author:

rennerc

Message:

compiles again

Location:

branches/network/src/world_entities/projectiles

Files:

• bomb.cc (modified) (1 diff)
• laser.cc (modified) (1 diff)
• rail_projectile.cc (modified) (1 diff)
• test_bullet.cc (modified) (1 diff)

branches/network/src/world_entities/projectiles/bomb.cc

@@ -166 +166 @@
 void Bomb::collidesWith (WorldEntity* entity, const Vector& location)
 {
-  if (this->lifeCycle < .9f && entity->isA(CL_NPC))
+  if (this->lifeCycle < .9f && entity->isA( "NPC" ))
     this->lifeCycle = 0.9f;
 }

branches/network/src/world_entities/projectiles/laser.cc

@@ -107 +107 @@
 void Laser::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;

branches/network/src/world_entities/projectiles/rail_projectile.cc

@@ -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;

branches/network/src/world_entities/projectiles/test_bullet.cc

@@ -119 +119 @@
 void TestBullet::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;