Index: trunk/src/world_entities/bsp_entity.cc
===================================================================
--- trunk/src/world_entities/bsp_entity.cc	(revision 10108)
+++ trunk/src/world_entities/bsp_entity.cc	(revision 10114)
@@ -19,6 +19,6 @@
 #include "loading/resource_manager.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(BspEntity, CL_BSP_ENTITY);
+
+ObjectListDefinition(BspEntity);
 CREATE_FACTORY(BspEntity);
 
Index: trunk/src/world_entities/creatures/fps_player.cc
===================================================================
--- trunk/src/world_entities/creatures/fps_player.cc	(revision 10108)
+++ trunk/src/world_entities/creatures/fps_player.cc	(revision 10114)
@@ -41,6 +41,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
+
+ObjectListDefinition(FPSPlayer);
 CREATE_FACTORY(FPSPlayer);
 
@@ -273,19 +273,8 @@
   {
     this->getWeaponManager().fire();
-
-//     WorldEntity* target = this->aimingSystem->getNearestTarget();
-//     if( target != NULL)
-//     {
-//       PRINTF(0)("hit hit hit, got: %s\n", target->getClassCName());
-//     }
-//     else
-//     {
-//       PRINTF(0)("nothing hit\n");
-//     }
   }
 
 
   //dealing damage
-
   if ( State::isOnline() && (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/))
   {
@@ -384,5 +373,5 @@
 
   // physical falling of the player
-  if( !this->isOnGround())
+  if( /*FIXME for testing*/ false && !this->isOnGround())
   {
     this->fallVelocity += 300.0f * time;
@@ -404,29 +393,7 @@
 
 
-  if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(CL_INTERACTIVE_MODEL))
+  if( likely(this->getModel(0) != NULL) && this->getModel(0)->isA(InteractiveModel::staticClassID()))
   {
     ((InteractiveModel*)this->getModel(0))->tick(time);
-
-    // handle animations differently
-
-
-
-
-
-//     else if( this->bFire && likely(this->getModel(0) != NULL))
-//     {
-//       if( ((InteractiveModel*)this->getModel(0))->getAnim() != ATTACK)
-//         ((InteractiveModel*)this->getModel(0))->setAnimation(ATTACK);
-//     }
-//     else if( fabs(move.len()) > 0.0f && likely(this->getModel(0) != NULL))
-//     {
-//       if( ((InteractiveModel*)this->getModel(0))->getAnim() != RUN)
-//         ((InteractiveModel*)this->getModel(0))->setAnimation(RUN);
-//     }
-//     else if (likely(this->getModel(0) != NULL))
-//     {
-//       if( ((InteractiveModel*)this->getModel(0))->getAnimation() != STAND)
-//         ((InteractiveModel*)this->getModel(0))->setAnimation(STAND);
-//     }
   }
 
Index: trunk/src/world_entities/creatures/md2_creature.cc
===================================================================
--- trunk/src/world_entities/creatures/md2_creature.cc	(revision 10108)
+++ trunk/src/world_entities/creatures/md2_creature.cc	(revision 10114)
@@ -36,6 +36,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
+
+ObjectListDefinition(MD2Creature);
 CREATE_FACTORY(MD2Creature);
 
Index: trunk/src/world_entities/effects/billboard.cc
===================================================================
--- trunk/src/world_entities/effects/billboard.cc	(revision 10108)
+++ trunk/src/world_entities/effects/billboard.cc	(revision 10114)
@@ -26,6 +26,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Billboard, CL_BILLBOARD);
+
+ObjectListDefinition(Billboard);
 CREATE_FACTORY(Billboard);
 
Index: trunk/src/world_entities/effects/explosion.cc
===================================================================
--- trunk/src/world_entities/effects/explosion.cc	(revision 10108)
+++ trunk/src/world_entities/effects/explosion.cc	(revision 10114)
@@ -27,6 +27,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Explosion, CL_EXPLOSION);
+
+ObjectListDefinition(Explosion);
 CREATE_FAST_FACTORY_STATIC(Explosion);
 
Index: trunk/src/world_entities/effects/lightning_bolt.cc
===================================================================
--- trunk/src/world_entities/effects/lightning_bolt.cc	(revision 10108)
+++ trunk/src/world_entities/effects/lightning_bolt.cc	(revision 10114)
@@ -25,6 +25,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(LightningBolt, CL_LIGHTNING_BOLT);
+
+ObjectListDefinition(LightningBolt);
 CREATE_FACTORY(LightningBolt);
 
Index: trunk/src/world_entities/elements/image_entity.cc
===================================================================
--- trunk/src/world_entities/elements/image_entity.cc	(revision 10108)
+++ trunk/src/world_entities/elements/image_entity.cc	(revision 10114)
@@ -30,6 +30,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(ImageEntity, CL_IMAGE_ENTITY);
+
+ObjectListDefinition(ImageEntity);
 CREATE_FACTORY(ImageEntity);
 
Index: trunk/src/world_entities/elements/text_element.cc
===================================================================
--- trunk/src/world_entities/elements/text_element.cc	(revision 10108)
+++ trunk/src/world_entities/elements/text_element.cc	(revision 10114)
@@ -27,6 +27,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
+
+ObjectListDefinition(TextElement);
 CREATE_FACTORY(TextElement);
 
Index: trunk/src/world_entities/environment.cc
===================================================================
--- trunk/src/world_entities/environment.cc	(revision 10108)
+++ trunk/src/world_entities/environment.cc	(revision 10114)
@@ -24,6 +24,6 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Environment, CL_ENVIRONMENT);
+
+ObjectListDefinition(Environment);
 CREATE_FACTORY(Environment);
 
Index: trunk/src/world_entities/environments/building.cc
===================================================================
--- trunk/src/world_entities/environments/building.cc	(revision 10108)
+++ trunk/src/world_entities/environments/building.cc	(revision 10114)
@@ -23,6 +23,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Building, CL_BUILDING);
+
+ObjectListDefinition(Building);
 CREATE_FACTORY(Building);
 
Index: trunk/src/world_entities/environments/mapped_water.cc
===================================================================
--- trunk/src/world_entities/environments/mapped_water.cc	(revision 10108)
+++ trunk/src/world_entities/environments/mapped_water.cc	(revision 10114)
@@ -26,6 +26,6 @@
 #include "resource_shader.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(MappedWater, CL_MAPPED_WATER);
+
+ObjectListDefinition(MappedWater);
 CREATE_FACTORY(MappedWater);
 
Index: trunk/src/world_entities/environments/model_entity.cc
===================================================================
--- trunk/src/world_entities/environments/model_entity.cc	(revision 10108)
+++ trunk/src/world_entities/environments/model_entity.cc	(revision 10114)
@@ -23,6 +23,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(ModelEntity, CL_MODEL_ENTITY);
+
+ObjectListDefinition(ModelEntity);
 CREATE_FACTORY(ModelEntity);
 
Index: trunk/src/world_entities/environments/water.cc
===================================================================
--- trunk/src/world_entities/environments/water.cc	(revision 10108)
+++ trunk/src/world_entities/environments/water.cc	(revision 10114)
@@ -32,6 +32,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Water, CL_WATER);
+
+ObjectListDefinition(Water);
 CREATE_FACTORY(Water);
 
Index: trunk/src/world_entities/movie_entity.cc
===================================================================
--- trunk/src/world_entities/movie_entity.cc	(revision 10108)
+++ trunk/src/world_entities/movie_entity.cc	(revision 10114)
@@ -21,6 +21,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(MovieEntity, CL_MOVIE_ENTITY);
+
+ObjectListDefinition(MovieEntity);
 CREATE_FACTORY(MovieEntity);
 
Index: trunk/src/world_entities/npcs/attractor_mine.cc
===================================================================
--- trunk/src/world_entities/npcs/attractor_mine.cc	(revision 10108)
+++ trunk/src/world_entities/npcs/attractor_mine.cc	(revision 10114)
@@ -33,6 +33,6 @@
 #include "effects/explosion.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
+
+ObjectListDefinition(AttractorMine);
 CREATE_FACTORY(AttractorMine);
 #include "script_class.h"
Index: trunk/src/world_entities/npcs/door.cc
===================================================================
--- trunk/src/world_entities/npcs/door.cc	(revision 10108)
+++ trunk/src/world_entities/npcs/door.cc	(revision 10114)
@@ -26,6 +26,6 @@
 #include "door.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Door, CL_DOOR);
+
+ObjectListDefinition(Door);
 CREATE_FACTORY(Door);
 
Index: trunk/src/world_entities/npcs/gate.cc
===================================================================
--- trunk/src/world_entities/npcs/gate.cc	(revision 10108)
+++ trunk/src/world_entities/npcs/gate.cc	(revision 10114)
@@ -31,6 +31,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Gate, CL_GATE);
+
+ObjectListDefinition(Gate);
 CREATE_FACTORY(Gate);
 
Index: trunk/src/world_entities/npcs/generic_npc.cc
===================================================================
--- trunk/src/world_entities/npcs/generic_npc.cc	(revision 10108)
+++ trunk/src/world_entities/npcs/generic_npc.cc	(revision 10114)
@@ -33,6 +33,6 @@
 #include "bsp_entity.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
+
+ObjectListDefinition(GenericNPC);
 CREATE_FACTORY(GenericNPC);
 
Index: trunk/src/world_entities/npcs/ground_turret.cc
===================================================================
--- trunk/src/world_entities/npcs/ground_turret.cc	(revision 10108)
+++ trunk/src/world_entities/npcs/ground_turret.cc	(revision 10114)
@@ -29,7 +29,7 @@
 #include "effects/explosion.h"
 
-#include "class_id_DEPRECATED.h"
 
-ObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
+
+ObjectListDefinition(GroundTurret);
 CREATE_FACTORY(GroundTurret);
 
Index: trunk/src/world_entities/npcs/network_turret.cc
===================================================================
--- trunk/src/world_entities/npcs/network_turret.cc	(revision 10108)
+++ trunk/src/world_entities/npcs/network_turret.cc	(revision 10114)
@@ -32,6 +32,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
+
+ObjectListDefinition(NetworkTurret);
 CREATE_FACTORY(NetworkTurret);
 
Index: trunk/src/world_entities/npcs/npc_test.cc
===================================================================
--- trunk/src/world_entities/npcs/npc_test.cc	(revision 10108)
+++ trunk/src/world_entities/npcs/npc_test.cc	(revision 10114)
@@ -30,6 +30,6 @@
 #include "effects/explosion.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(NPC2, CL_NPC_TEST2);
+
+ObjectListDefinition(NPC2);
 CREATE_FACTORY(NPC2);
 
Index: trunk/src/world_entities/npcs/repair_station.cc
===================================================================
--- trunk/src/world_entities/npcs/repair_station.cc	(revision 10108)
+++ trunk/src/world_entities/npcs/repair_station.cc	(revision 10114)
@@ -26,6 +26,6 @@
 #include "repair_station.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(RepairStation, CL_DOOR +1 );
+
+ObjectListDefinition(RepairStation);
 CREATE_FACTORY(RepairStation);
 
Index: trunk/src/world_entities/npcs/space_turret.cc
===================================================================
--- trunk/src/world_entities/npcs/space_turret.cc	(revision 10108)
+++ trunk/src/world_entities/npcs/space_turret.cc	(revision 10114)
@@ -29,6 +29,6 @@
 #include "effects/explosion.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
+
+ObjectListDefinition(SpaceTurret);
 CREATE_FACTORY(SpaceTurret);
 
Index: trunk/src/world_entities/particles/box_emitter.cc
===================================================================
--- trunk/src/world_entities/particles/box_emitter.cc	(revision 10108)
+++ trunk/src/world_entities/particles/box_emitter.cc	(revision 10114)
@@ -24,7 +24,7 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
 
-ObjectListDefinitionID(BoxEmitter, CL_BOX_EMITTER);
+
+ObjectListDefinition(BoxEmitter);
 CREATE_FACTORY(BoxEmitter);
 
Index: trunk/src/world_entities/particles/dot_emitter.cc
===================================================================
--- trunk/src/world_entities/particles/dot_emitter.cc	(revision 10108)
+++ trunk/src/world_entities/particles/dot_emitter.cc	(revision 10114)
@@ -26,6 +26,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(DotEmitter, CL_DOT_EMITTER);
+
+ObjectListDefinition(DotEmitter);
 CREATE_FACTORY(DotEmitter);
 
Index: trunk/src/world_entities/particles/dot_particles.cc
===================================================================
--- trunk/src/world_entities/particles/dot_particles.cc	(revision 10108)
+++ trunk/src/world_entities/particles/dot_particles.cc	(revision 10114)
@@ -23,7 +23,7 @@
 #include "state.h"
 
-#include "class_id_DEPRECATED.h"
 
-ObjectListDefinitionID(DotParticles, CL_DOT_PARTICLES);
+
+ObjectListDefinition(DotParticles);
 CREATE_FACTORY(DotParticles);
 
Index: trunk/src/world_entities/particles/model_particles.cc
===================================================================
--- trunk/src/world_entities/particles/model_particles.cc	(revision 10108)
+++ trunk/src/world_entities/particles/model_particles.cc	(revision 10114)
@@ -25,7 +25,7 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
 
-ObjectListDefinitionID(ModelParticles, CL_MODEL_PARTICLES);
+
+ObjectListDefinition(ModelParticles);
 CREATE_FACTORY(ModelParticles);
 
Index: trunk/src/world_entities/particles/plane_emitter.cc
===================================================================
--- trunk/src/world_entities/particles/plane_emitter.cc	(revision 10108)
+++ trunk/src/world_entities/particles/plane_emitter.cc	(revision 10114)
@@ -24,7 +24,7 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
 
-ObjectListDefinitionID(PlaneEmitter, CL_PLANE_EMITTER);
+
+ObjectListDefinition(PlaneEmitter);
 CREATE_FACTORY(PlaneEmitter);
 
Index: trunk/src/world_entities/particles/spark_particles.cc
===================================================================
--- trunk/src/world_entities/particles/spark_particles.cc	(revision 10108)
+++ trunk/src/world_entities/particles/spark_particles.cc	(revision 10114)
@@ -24,7 +24,7 @@
 #include "shell_command.h"
 
-#include "class_id_DEPRECATED.h"
 
-ObjectListDefinitionID(SparkParticles, CL_SPARK_PARTICLES);
+
+ObjectListDefinition(SparkParticles);
 CREATE_FACTORY(SparkParticles);
 
Index: trunk/src/world_entities/particles/sprite_particles.cc
===================================================================
--- trunk/src/world_entities/particles/sprite_particles.cc	(revision 10108)
+++ trunk/src/world_entities/particles/sprite_particles.cc	(revision 10114)
@@ -24,7 +24,7 @@
 #include "shell_command.h"
 
-#include "class_id_DEPRECATED.h"
 
-ObjectListDefinitionID(SpriteParticles, CL_SPRITE_PARTICLES);
+
+ObjectListDefinition(SpriteParticles);
 CREATE_FACTORY(SpriteParticles);
 
Index: trunk/src/world_entities/planet.cc
===================================================================
--- trunk/src/world_entities/planet.cc	(revision 10108)
+++ trunk/src/world_entities/planet.cc	(revision 10114)
@@ -32,6 +32,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Planet, CL_PLANET);
+
+ObjectListDefinition(Planet);
 CREATE_FACTORY(Planet);
 
Index: trunk/src/world_entities/power_ups/laser_power_up.cc
===================================================================
--- trunk/src/world_entities/power_ups/laser_power_up.cc	(revision 10108)
+++ trunk/src/world_entities/power_ups/laser_power_up.cc	(revision 10114)
@@ -24,6 +24,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
+
+ObjectListDefinition(LaserPowerUp);
 CREATE_FACTORY(LaserPowerUp);
 
@@ -80,5 +80,5 @@
 {
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
- if (entity->isA(CL_PLAYABLE))
+  if (entity->isA(Playable::staticClassID()))
   this->toList(OM_DEAD);
 }
Index: trunk/src/world_entities/power_ups/param_power_up.cc
===================================================================
--- trunk/src/world_entities/power_ups/param_power_up.cc	(revision 10108)
+++ trunk/src/world_entities/power_ups/param_power_up.cc	(revision 10114)
@@ -27,6 +27,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
+
+ObjectListDefinition(ParamPowerUp);
 CREATE_FACTORY(ParamPowerUp);
 
Index: trunk/src/world_entities/power_ups/turret_power_up.cc
===================================================================
--- trunk/src/world_entities/power_ups/turret_power_up.cc	(revision 10108)
+++ trunk/src/world_entities/power_ups/turret_power_up.cc	(revision 10114)
@@ -24,6 +24,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
+
+ObjectListDefinition(TurretPowerUp);
 CREATE_FACTORY(TurretPowerUp);
 
@@ -76,5 +76,5 @@
 {
  // PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassCName(), entity->getClassCName(), location.x, location.y, location.z);
- if (entity->isA(CL_PLAYABLE))
+  if (entity->isA(Playable::staticClassID()))
    this->toList(OM_DEAD);
 }
Index: trunk/src/world_entities/power_ups/weapon_power_up.cc
===================================================================
--- trunk/src/world_entities/power_ups/weapon_power_up.cc	(revision 10108)
+++ trunk/src/world_entities/power_ups/weapon_power_up.cc	(revision 10114)
@@ -27,6 +27,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
+
+ObjectListDefinition(WeaponPowerUp);
 CREATE_FACTORY(WeaponPowerUp);
 
Index: trunk/src/world_entities/projectiles/bomb.cc
===================================================================
--- trunk/src/world_entities/projectiles/bomb.cc	(revision 10108)
+++ 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 10108)
+++ 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 10108)
+++ 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 10108)
+++ 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 10108)
+++ 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 10108)
+++ 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 10108)
+++ 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 10108)
+++ 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;
Index: trunk/src/world_entities/recorder.cc
===================================================================
--- trunk/src/world_entities/recorder.cc	(revision 10108)
+++ trunk/src/world_entities/recorder.cc	(revision 10114)
@@ -21,6 +21,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Recorder, CL_RECORDER);
+
+ObjectListDefinition(Recorder);
 CREATE_FACTORY(Recorder);
 
Index: trunk/src/world_entities/skybox.cc
===================================================================
--- trunk/src/world_entities/skybox.cc	(revision 10108)
+++ trunk/src/world_entities/skybox.cc	(revision 10114)
@@ -31,6 +31,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(SkyBox, CL_SKYBOX);
+
+ObjectListDefinition(SkyBox);
 CREATE_FACTORY(SkyBox);
 
Index: trunk/src/world_entities/space_ships/collision_probe.cc
===================================================================
--- trunk/src/world_entities/space_ships/collision_probe.cc	(revision 10108)
+++ trunk/src/world_entities/space_ships/collision_probe.cc	(revision 10114)
@@ -24,6 +24,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
+
+ObjectListDefinition(CollisionProbe);
 
 CREATE_FACTORY(CollisionProbe);
Index: trunk/src/world_entities/space_ships/cruizer.cc
===================================================================
--- trunk/src/world_entities/space_ships/cruizer.cc	(revision 10108)
+++ trunk/src/world_entities/space_ships/cruizer.cc	(revision 10114)
@@ -34,6 +34,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Cruizer, CL_CRUIZER);
+
+ObjectListDefinition(Cruizer);
 CREATE_FACTORY(Cruizer);
 
Index: trunk/src/world_entities/space_ships/helicopter.cc
===================================================================
--- trunk/src/world_entities/space_ships/helicopter.cc	(revision 10108)
+++ trunk/src/world_entities/space_ships/helicopter.cc	(revision 10114)
@@ -34,6 +34,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Helicopter, CL_HELICOPTER);
+
+ObjectListDefinition(Helicopter);
 CREATE_FACTORY(Helicopter);
 #include "script_class.h"
Index: trunk/src/world_entities/space_ships/hover.cc
===================================================================
--- trunk/src/world_entities/space_ships/hover.cc	(revision 10108)
+++ trunk/src/world_entities/space_ships/hover.cc	(revision 10114)
@@ -34,6 +34,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Hover, CL_HOVER);
+
+ObjectListDefinition(Hover);
 CREATE_FACTORY(Hover);
 
Index: trunk/src/world_entities/space_ships/space_ship.cc
===================================================================
--- trunk/src/world_entities/space_ships/space_ship.cc	(revision 10108)
+++ trunk/src/world_entities/space_ships/space_ship.cc	(revision 10114)
@@ -53,6 +53,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
+
+ObjectListDefinition(SpaceShip);
 CREATE_FACTORY(SpaceShip);
 
Index: trunk/src/world_entities/space_ships/spacecraft_2d.cc
===================================================================
--- trunk/src/world_entities/space_ships/spacecraft_2d.cc	(revision 10108)
+++ trunk/src/world_entities/space_ships/spacecraft_2d.cc	(revision 10114)
@@ -38,6 +38,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
+
+ObjectListDefinition(Spacecraft2D);
 CREATE_FACTORY(Spacecraft2D);
 
Index: trunk/src/world_entities/space_ships/turbine_hover.cc
===================================================================
--- trunk/src/world_entities/space_ships/turbine_hover.cc	(revision 10108)
+++ trunk/src/world_entities/space_ships/turbine_hover.cc	(revision 10114)
@@ -34,6 +34,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TurbineHover, CL_TURBINE_HOVER);
+
+ObjectListDefinition(TurbineHover);
 CREATE_FACTORY(TurbineHover);
 
Index: trunk/src/world_entities/spawning_point.cc
===================================================================
--- trunk/src/world_entities/spawning_point.cc	(revision 10108)
+++ trunk/src/world_entities/spawning_point.cc	(revision 10114)
@@ -33,6 +33,6 @@
 #include "converter.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(SpawningPoint, CL_SPAWNING_POINT);
+
+ObjectListDefinition(SpawningPoint);
 CREATE_FACTORY( SpawningPoint);
 /**
Index: trunk/src/world_entities/spectator.cc
===================================================================
--- trunk/src/world_entities/spectator.cc	(revision 10108)
+++ trunk/src/world_entities/spectator.cc	(revision 10114)
@@ -22,6 +22,9 @@
 #include "shared_network_data.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Spectator, CL_SPECTATOR);
+#include "src/world_entities/creatures/fps_player.h"
+#include "src/world_entities/npcs/generic_npc.h"
+
+
+ObjectListDefinition(Spectator);
 CREATE_FACTORY(Spectator);
 
@@ -83,4 +86,5 @@
   registerEvent(KeyMapper::PEV_RIGHT);
   registerEvent(KeyMapper::PEV_FIRE1);
+  registerEvent(KeyMapper::PEV_JUMP);
   registerEvent(EV_MOUSE_MOTION);
 
@@ -233,7 +237,23 @@
     this->yMouse += event.yRel;
   }
-}
-
-
-
-
+  else if( event.type == KeyMapper::PEV_JUMP)
+  {
+//     FPSPlayer * fps = new FPSPlayer();
+    //GenericNPC* fps = new GenericNPC();
+    WorldEntity* fps = new WorldEntity();
+    //WorldEntity * fps = new WorldEntity();
+
+    fps->setAbsCoor( this->getAbsCoorX(), this->getAbsCoorY(), this->getAbsCoorZ() );
+    fps->setAbsDir( this->getAbsDir() );
+    fps->loadMD2Texture( "doom_guy.png" );
+    fps->loadModel( "models/creatures/doom_guy.md2", 10.0f );
+    fps->toList( OM_GROUP_00);
+    //fps->loadModel( "models/ships/terran_cruizer.obj" );
+
+    //((Playable*)fps)->setPlayDirection(  0, 0, 1, 0 );
+  }
+}
+
+
+
+
Index: trunk/src/world_entities/terrain.cc
===================================================================
--- trunk/src/world_entities/terrain.cc	(revision 10108)
+++ trunk/src/world_entities/terrain.cc	(revision 10114)
@@ -34,6 +34,6 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Terrain, CL_TERRAIN);
+
+ObjectListDefinition(Terrain);
 CREATE_FACTORY(Terrain);
 
Index: trunk/src/world_entities/test_entity.cc
===================================================================
--- trunk/src/world_entities/test_entity.cc	(revision 10108)
+++ trunk/src/world_entities/test_entity.cc	(revision 10114)
@@ -33,5 +33,5 @@
 
 
-#include "class_id_DEPRECATED.h"
+
 ObjectListDefinition(TestEntity);
 CREATE_FACTORY(TestEntity);
Index: trunk/src/world_entities/weapons/aiming_turret.cc
===================================================================
--- trunk/src/world_entities/weapons/aiming_turret.cc	(revision 10108)
+++ trunk/src/world_entities/weapons/aiming_turret.cc	(revision 10114)
@@ -27,6 +27,6 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
+
+ObjectListDefinition(AimingTurret);
 CREATE_FACTORY(AimingTurret);
 
Index: trunk/src/world_entities/weapons/boomerang_gun.cc
===================================================================
--- trunk/src/world_entities/weapons/boomerang_gun.cc	(revision 10108)
+++ trunk/src/world_entities/weapons/boomerang_gun.cc	(revision 10114)
@@ -27,6 +27,6 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
+
+ObjectListDefinition(BoomerangGun);
 CREATE_FACTORY(BoomerangGun);
 
Index: trunk/src/world_entities/weapons/cannon.cc
===================================================================
--- trunk/src/world_entities/weapons/cannon.cc	(revision 10108)
+++ trunk/src/world_entities/weapons/cannon.cc	(revision 10114)
@@ -36,6 +36,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Cannon, CL_CANNON);
+
+ObjectListDefinition(Cannon);
 CREATE_FACTORY(Cannon);
 
Index: trunk/src/world_entities/weapons/fps_sniper_rifle.cc
===================================================================
--- trunk/src/world_entities/weapons/fps_sniper_rifle.cc	(revision 10108)
+++ trunk/src/world_entities/weapons/fps_sniper_rifle.cc	(revision 10114)
@@ -39,6 +39,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
+
+ObjectListDefinition(FPSSniperRifle);
 CREATE_FACTORY(FPSSniperRifle);
 
Index: trunk/src/world_entities/weapons/hyperblaster.cc
===================================================================
--- trunk/src/world_entities/weapons/hyperblaster.cc	(revision 10108)
+++ trunk/src/world_entities/weapons/hyperblaster.cc	(revision 10114)
@@ -35,6 +35,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
+
+ObjectListDefinition(Hyperblaster);
 CREATE_FACTORY(Hyperblaster);
 
Index: trunk/src/world_entities/weapons/laser_cannon.cc
===================================================================
--- trunk/src/world_entities/weapons/laser_cannon.cc	(revision 10108)
+++ trunk/src/world_entities/weapons/laser_cannon.cc	(revision 10114)
@@ -31,6 +31,6 @@
 #include "loading/fast_factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
+
+ObjectListDefinition(LaserCannon);
 CREATE_FACTORY(LaserCannon);
 
Index: trunk/src/world_entities/weapons/targeting_turret.cc
===================================================================
--- trunk/src/world_entities/weapons/targeting_turret.cc	(revision 10108)
+++ trunk/src/world_entities/weapons/targeting_turret.cc	(revision 10114)
@@ -26,6 +26,6 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
+
+ObjectListDefinition(TargetingTurret);
 CREATE_FACTORY(TargetingTurret);
 
Index: trunk/src/world_entities/weapons/test_gun.cc
===================================================================
--- trunk/src/world_entities/weapons/test_gun.cc	(revision 10108)
+++ trunk/src/world_entities/weapons/test_gun.cc	(revision 10114)
@@ -33,6 +33,6 @@
 #include "loading/fast_factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(TestGun, CL_TEST_GUN);
+
+ObjectListDefinition(TestGun);
 CREATE_FACTORY(TestGun);
 /**
Index: trunk/src/world_entities/weapons/turret.cc
===================================================================
--- trunk/src/world_entities/weapons/turret.cc	(revision 10108)
+++ trunk/src/world_entities/weapons/turret.cc	(revision 10114)
@@ -27,6 +27,6 @@
 #include "util/loading/factory.h"
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(Turret, CL_TURRET);
+
+ObjectListDefinition(Turret);
 CREATE_FACTORY(Turret);
 
Index: trunk/src/world_entities/weather_effects/cloud_effect.cc
===================================================================
--- trunk/src/world_entities/weather_effects/cloud_effect.cc	(revision 10108)
+++ trunk/src/world_entities/weather_effects/cloud_effect.cc	(revision 10114)
@@ -30,5 +30,5 @@
 #include "resource_shader.h"
 
-#include "class_id_DEPRECATED.h"
+
 
 Vector    CloudEffect::cloudColor;
@@ -41,5 +41,5 @@
 float     CloudEffect::fadeTime;
 
-ObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
+ObjectListDefinition(CloudEffect);
 
 
Index: trunk/src/world_entities/weather_effects/fog_effect.cc
===================================================================
--- trunk/src/world_entities/weather_effects/fog_effect.cc	(revision 10108)
+++ trunk/src/world_entities/weather_effects/fog_effect.cc	(revision 10114)
@@ -30,5 +30,5 @@
 SHELL_COMMAND(fadeout, FogEffect, fadeOutFog);
 
-#include "class_id_DEPRECATED.h"
+
 
 CREATE_SCRIPTABLE_CLASS(FogEffect,
Index: trunk/src/world_entities/weather_effects/lense_flare.cc
===================================================================
--- trunk/src/world_entities/weather_effects/lense_flare.cc	(revision 10108)
+++ trunk/src/world_entities/weather_effects/lense_flare.cc	(revision 10114)
@@ -34,7 +34,7 @@
 #include "camera.h"
 
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);
+
+
+ObjectListDefinition(LenseFlare);
 CREATE_FACTORY(LenseFlare);
 
Index: trunk/src/world_entities/weather_effects/lightning_effect.cc
===================================================================
--- trunk/src/world_entities/weather_effects/lightning_effect.cc	(revision 10108)
+++ trunk/src/world_entities/weather_effects/lightning_effect.cc	(revision 10114)
@@ -28,7 +28,7 @@
 #include "script_class.h"
 #include "debug.h"
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
+
+
+ObjectListDefinition(LightningEffect);
 
 SHELL_COMMAND(activate, LightningEffect, activateLightning);
Index: trunk/src/world_entities/weather_effects/rain_effect.cc
===================================================================
--- trunk/src/world_entities/weather_effects/rain_effect.cc	(revision 10108)
+++ trunk/src/world_entities/weather_effects/rain_effect.cc	(revision 10114)
@@ -32,7 +32,7 @@
 #include "debug.h"
 
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
+
+
+ObjectListDefinition(RainEffect);
 
 // Define shell commands
Index: trunk/src/world_entities/weather_effects/snow_effect.cc
===================================================================
--- trunk/src/world_entities/weather_effects/snow_effect.cc	(revision 10108)
+++ trunk/src/world_entities/weather_effects/snow_effect.cc	(revision 10114)
@@ -30,7 +30,7 @@
 #include "cloud_effect.h"
 
-#include "class_id_DEPRECATED.h"
-
-ObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
+
+
+ObjectListDefinition(SnowEffect);
 SHELL_COMMAND(activate, SnowEffect, activateSnow);
 SHELL_COMMAND(deactivate, SnowEffect, deactivateSnow);
Index: trunk/src/world_entities/weather_effects/volfog_effect.cc
===================================================================
--- trunk/src/world_entities/weather_effects/volfog_effect.cc	(revision 10108)
+++ trunk/src/world_entities/weather_effects/volfog_effect.cc	(revision 10114)
@@ -49,6 +49,6 @@
 
 
-#include "class_id_DEPRECATED.h"
-ObjectListDefinitionID(VolFogEffect, CL_VOLFOG_EFFECT);
+
+ObjectListDefinition(VolFogEffect);
 CREATE_FACTORY(VolFogEffect);
 
