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

Timestamp:

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

Author:

patrick

Message:

merged network back to trunk

Location:

trunk/src/world_entities/projectiles

Files:

• bomb.cc (modified) (2 diffs)
• boomerang_projectile.cc (modified) (1 diff)
• guided_missile.cc (modified) (1 diff)
• hyperblast.cc (modified) (1 diff)
• laser.cc (modified) (2 diffs)
• rail_projectile.cc (modified) (2 diffs)
• rocket.cc (modified) (1 diff)
• test_bullet.cc (modified) (2 diffs)

trunk/src/world_entities/projectiles/bomb.cc

@@ -25 +25 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Bomb, CL_BOMB);
+
+ObjectListDefinition(Bomb);
 CREATE_FAST_FACTORY_STATIC(Bomb);
 
@@ -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;
 }

trunk/src/world_entities/projectiles/boomerang_projectile.cc

@@ -26 +26 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
+
+ObjectListDefinition(BoomerangProjectile);
 CREATE_FAST_FACTORY_STATIC(BoomerangProjectile);
 

trunk/src/world_entities/projectiles/guided_missile.cc

@@ -25 +25 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(GuidedMissile, CL_GUIDED_MISSILE);
+
+ObjectListDefinition(GuidedMissile);
 CREATE_FAST_FACTORY_STATIC(GuidedMissile);
 

trunk/src/world_entities/projectiles/hyperblast.cc

@@ -25 +25 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Hyperblast, CL_HYPERBLAST);
+
+ObjectListDefinition(Hyperblast);
 CREATE_FAST_FACTORY_STATIC(Hyperblast);
 

trunk/src/world_entities/projectiles/laser.cc

@@ -28 +28 @@
 
 
-#include "class_id_DEPRECATED.h"
+
 ObjectListDefinition(Laser);
 CREATE_FAST_FACTORY_STATIC(Laser);
@@ -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;

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;

trunk/src/world_entities/projectiles/rocket.cc

@@ -25 +25 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Rocket, CL_ROCKET);
+
+ObjectListDefinition(Rocket);
 CREATE_FAST_FACTORY_STATIC(Rocket);
 

trunk/src/world_entities/projectiles/test_bullet.cc

@@ -24 +24 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
+
+ObjectListDefinition(TestBullet);
 CREATE_FAST_FACTORY_STATIC(TestBullet);
 
@@ -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;