Index: trunk/src/world_entities/projectiles/bomb.cc
===================================================================
--- trunk/src/world_entities/projectiles/bomb.cc	(revision 10013)
+++ trunk/src/world_entities/projectiles/bomb.cc	(revision 10114)
@@ -25,6 +25,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Bomb, CL_BOMB);
+
+ObjectListDefinition(Bomb);
 CREATE_FAST_FACTORY_STATIC(Bomb);
 
@@ -166,5 +166,5 @@
 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;
 }
Index: trunk/src/world_entities/projectiles/boomerang_projectile.cc
===================================================================
--- trunk/src/world_entities/projectiles/boomerang_projectile.cc	(revision 10013)
+++ trunk/src/world_entities/projectiles/boomerang_projectile.cc	(revision 10114)
@@ -26,6 +26,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
+
+ObjectListDefinition(BoomerangProjectile);
 CREATE_FAST_FACTORY_STATIC(BoomerangProjectile);
 
Index: trunk/src/world_entities/projectiles/guided_missile.cc
===================================================================
--- trunk/src/world_entities/projectiles/guided_missile.cc	(revision 10013)
+++ trunk/src/world_entities/projectiles/guided_missile.cc	(revision 10114)
@@ -25,6 +25,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(GuidedMissile, CL_GUIDED_MISSILE);
+
+ObjectListDefinition(GuidedMissile);
 CREATE_FAST_FACTORY_STATIC(GuidedMissile);
 
Index: trunk/src/world_entities/projectiles/hyperblast.cc
===================================================================
--- trunk/src/world_entities/projectiles/hyperblast.cc	(revision 10013)
+++ trunk/src/world_entities/projectiles/hyperblast.cc	(revision 10114)
@@ -25,6 +25,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Hyperblast, CL_HYPERBLAST);
+
+ObjectListDefinition(Hyperblast);
 CREATE_FAST_FACTORY_STATIC(Hyperblast);
 
Index: trunk/src/world_entities/projectiles/laser.cc
===================================================================
--- trunk/src/world_entities/projectiles/laser.cc	(revision 10013)
+++ trunk/src/world_entities/projectiles/laser.cc	(revision 10114)
@@ -28,5 +28,5 @@
 
 
-#include "class_id_DEPRECATED.h"
+
 ObjectListDefinition(Laser);
 CREATE_FAST_FACTORY_STATIC(Laser);
@@ -107,5 +107,5 @@
 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;
Index: trunk/src/world_entities/projectiles/rail_projectile.cc
===================================================================
--- trunk/src/world_entities/projectiles/rail_projectile.cc	(revision 10013)
+++ trunk/src/world_entities/projectiles/rail_projectile.cc	(revision 10114)
@@ -28,6 +28,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
+
+ObjectListDefinition(RailProjectile);
 CREATE_FAST_FACTORY_STATIC(RailProjectile);
 
@@ -106,5 +106,5 @@
 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;
Index: trunk/src/world_entities/projectiles/rocket.cc
===================================================================
--- trunk/src/world_entities/projectiles/rocket.cc	(revision 10013)
+++ trunk/src/world_entities/projectiles/rocket.cc	(revision 10114)
@@ -25,6 +25,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Rocket, CL_ROCKET);
+
+ObjectListDefinition(Rocket);
 CREATE_FAST_FACTORY_STATIC(Rocket);
 
Index: trunk/src/world_entities/projectiles/test_bullet.cc
===================================================================
--- trunk/src/world_entities/projectiles/test_bullet.cc	(revision 10013)
+++ trunk/src/world_entities/projectiles/test_bullet.cc	(revision 10114)
@@ -24,6 +24,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
+
+ObjectListDefinition(TestBullet);
 CREATE_FAST_FACTORY_STATIC(TestBullet);
 
@@ -119,5 +119,5 @@
 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;
