Changeset 9715 in orxonox.OLD for branches/new_class_id/src/world_entities

Timestamp:

Sep 1, 2006, 8:06:39 PM (18 years ago)

Author:

bensch

Message:

renamed newclassid to classid and newobjectlist to objectlist

Location:

branches/new_class_id/src/world_entities

Files:

• bsp_entity.cc (modified) (1 diff)
• bsp_entity.h (modified) (1 diff)
• camera.cc (modified) (2 diffs)
• camera.h (modified) (2 diffs)
• character_attributes.cc (modified) (1 diff)
• character_attributes.h (modified) (1 diff)
• creatures/fps_player.cc (modified) (1 diff)
• creatures/fps_player.h (modified) (1 diff)
• creatures/md2_creature.cc (modified) (1 diff)
• creatures/md2_creature.h (modified) (1 diff)
• effects/billboard.cc (modified) (1 diff)
• effects/billboard.h (modified) (1 diff)
• effects/explosion.cc (modified) (1 diff)
• effects/explosion.h (modified) (1 diff)
• effects/lightning_bolt.cc (modified) (1 diff)
• effects/lightning_bolt.h (modified) (2 diffs)
• elements/image_entity.cc (modified) (1 diff)
• elements/image_entity.h (modified) (1 diff)
• elements/text_element.cc (modified) (1 diff)
• elements/text_element.h (modified) (1 diff)
• environment.cc (modified) (1 diff)
• environment.h (modified) (1 diff)
• environments/building.cc (modified) (1 diff)
• environments/building.h (modified) (1 diff)
• environments/mapped_water.cc (modified) (1 diff)
• environments/mapped_water.h (modified) (1 diff)
• environments/model_entity.cc (modified) (1 diff)
• environments/model_entity.h (modified) (1 diff)
• environments/water.cc (modified) (1 diff)
• environments/water.h (modified) (1 diff)
• extendable.cc (modified) (1 diff)
• extendable.h (modified) (1 diff)
• movie_entity.cc (modified) (1 diff)
• movie_entity.h (modified) (1 diff)
• npcs/attractor_mine.cc (modified) (1 diff)
• npcs/attractor_mine.h (modified) (1 diff)
• npcs/door.cc (modified) (3 diffs)
• npcs/door.h (modified) (1 diff)
• npcs/gate.cc (modified) (3 diffs)
• npcs/gate.h (modified) (1 diff)
• npcs/generic_npc.cc (modified) (1 diff)
• npcs/generic_npc.h (modified) (1 diff)
• npcs/ground_turret.cc (modified) (1 diff)
• npcs/ground_turret.h (modified) (1 diff)
• npcs/network_turret.cc (modified) (1 diff)
• npcs/network_turret.h (modified) (1 diff)
• npcs/npc.cc (modified) (1 diff)
• npcs/npc.h (modified) (1 diff)
• npcs/npc_test.cc (modified) (1 diff)
• npcs/npc_test.h (modified) (1 diff)
• npcs/npc_test1.cc (modified) (1 diff)
• npcs/npc_test1.h (modified) (1 diff)
• npcs/repair_station.cc (modified) (1 diff)
• npcs/repair_station.h (modified) (1 diff)
• npcs/space_turret.cc (modified) (1 diff)
• npcs/space_turret.h (modified) (1 diff)
• planet.cc (modified) (1 diff)
• planet.h (modified) (1 diff)
• playable.cc (modified) (1 diff)
• playable.h (modified) (1 diff)
• player.cc (modified) (2 diffs)
• player.h (modified) (1 diff)
• power_ups/laser_power_up.cc (modified) (1 diff)
• power_ups/laser_power_up.h (modified) (1 diff)
• power_ups/param_power_up.cc (modified) (1 diff)
• power_ups/param_power_up.h (modified) (1 diff)
• power_ups/power_up.cc (modified) (1 diff)
• power_ups/power_up.h (modified) (1 diff)
• power_ups/turret_power_up.cc (modified) (1 diff)
• power_ups/turret_power_up.h (modified) (1 diff)
• power_ups/weapon_power_up.cc (modified) (1 diff)
• power_ups/weapon_power_up.h (modified) (1 diff)
• projectiles/bomb.cc (modified) (1 diff)
• projectiles/bomb.h (modified) (1 diff)
• projectiles/boomerang_projectile.cc (modified) (1 diff)
• projectiles/boomerang_projectile.h (modified) (1 diff)
• projectiles/guided_missile.cc (modified) (1 diff)
• projectiles/guided_missile.h (modified) (1 diff)
• projectiles/hyperblast.cc (modified) (1 diff)
• projectiles/hyperblast.h (modified) (1 diff)
• projectiles/laser.cc (modified) (1 diff)
• projectiles/laser.h (modified) (1 diff)
• projectiles/projectile.cc (modified) (1 diff)
• projectiles/projectile.h (modified) (1 diff)
• projectiles/rail_projectile.cc (modified) (1 diff)
• projectiles/rail_projectile.h (modified) (1 diff)
• projectiles/rocket.cc (modified) (1 diff)
• projectiles/rocket.h (modified) (1 diff)
• projectiles/test_bullet.cc (modified) (1 diff)
• projectiles/test_bullet.h (modified) (1 diff)
• recorder.cc (modified) (1 diff)
• recorder.h (modified) (1 diff)
• satellite.cc (modified) (1 diff)
• satellite.h (modified) (1 diff)
• script_trigger.cc (modified) (1 diff)
• script_trigger.h (modified) (1 diff)
• skybox.cc (modified) (1 diff)
• skybox.h (modified) (1 diff)
• skydome.cc (modified) (1 diff)
• skydome.h (modified) (1 diff)
• skysphere.cc (modified) (1 diff)
• skysphere.h (modified) (1 diff)
• space_ships/collision_probe.cc (modified) (1 diff)
• space_ships/collision_probe.h (modified) (1 diff)
• space_ships/cruizer.cc (modified) (1 diff)
• space_ships/cruizer.h (modified) (1 diff)
• space_ships/helicopter.cc (modified) (1 diff)
• space_ships/helicopter.h (modified) (1 diff)
• space_ships/hover.cc (modified) (1 diff)
• space_ships/hover.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)
• space_ships/space_ship.h (modified) (1 diff)
• space_ships/spacecraft_2d.cc (modified) (1 diff)
• space_ships/spacecraft_2d.h (modified) (1 diff)
• space_ships/turbine_hover.cc (modified) (1 diff)
• space_ships/turbine_hover.h (modified) (1 diff)
• spawning_point.cc (modified) (5 diffs)
• spawning_point.h (modified) (1 diff)
• spectator.cc (modified) (1 diff)
• spectator.h (modified) (1 diff)
• terrain.cc (modified) (1 diff)
• terrain.h (modified) (1 diff)
• test_entity.cc (modified) (1 diff)
• test_entity.h (modified) (1 diff)
• weapons/aim.cc (modified) (1 diff)
• weapons/aim.h (modified) (1 diff)
• weapons/aiming_system.cc (modified) (1 diff)
• weapons/aiming_system.h (modified) (1 diff)
• weapons/aiming_turret.cc (modified) (1 diff)
• weapons/aiming_turret.h (modified) (1 diff)
• weapons/ammo_container.cc (modified) (1 diff)
• weapons/ammo_container.h (modified) (2 diffs)
• weapons/boomerang_gun.cc (modified) (1 diff)
• weapons/boomerang_gun.h (modified) (1 diff)
• weapons/cannon.cc (modified) (1 diff)
• weapons/cannon.h (modified) (1 diff)
• weapons/crosshair.cc (modified) (1 diff)
• weapons/crosshair.h (modified) (1 diff)
• weapons/fps_sniper_rifle.cc (modified) (1 diff)
• weapons/fps_sniper_rifle.h (modified) (1 diff)
• weapons/hyperblaster.cc (modified) (1 diff)
• weapons/hyperblaster.h (modified) (1 diff)
• weapons/laser_cannon.cc (modified) (1 diff)
• weapons/laser_cannon.h (modified) (1 diff)
• weapons/targeting_turret.cc (modified) (1 diff)
• weapons/targeting_turret.h (modified) (1 diff)
• weapons/test_gun.cc (modified) (1 diff)
• weapons/test_gun.h (modified) (1 diff)
• weapons/turret.cc (modified) (1 diff)
• weapons/turret.h (modified) (1 diff)
• weapons/weapon.cc (modified) (3 diffs)
• weapons/weapon.h (modified) (4 diffs)
• weapons/weapon_manager.cc (modified) (3 diffs)
• weapons/weapon_manager.h (modified) (3 diffs)
• world_entity.cc (modified) (5 diffs)
• world_entity.h (modified) (2 diffs)

branches/new_class_id/src/world_entities/bsp_entity.cc

@@ -19 +19 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(BspEntity, CL_BSP_ENTITY);
+ObjectListDefinitionID(BspEntity, CL_BSP_ENTITY);
 CREATE_FACTORY(BspEntity);
 

branches/new_class_id/src/world_entities/bsp_entity.h

@@ -18 +18 @@
 class BspEntity : public WorldEntity
 {
-  NewObjectListDeclaration(BspEntity);
+  ObjectListDeclaration(BspEntity);
  public:
   BspEntity(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/camera.cc

@@ -19 +19 @@
 #include "glincl.h"
 
-NewObjectListDefinition(Camera);
+ObjectListDefinition(Camera);
 
 /**
@@ -223 +223 @@
 ///////////////////
 
-NewObjectListDefinition(CameraTarget);
+ObjectListDefinition(CameraTarget);
 CameraTarget::CameraTarget()
 {

branches/new_class_id/src/world_entities/camera.h

@@ -22 +22 @@
 class Camera : public PNode, public EventListener
 {
-  NewObjectListDeclaration(Camera);
+  ObjectListDeclaration(Camera);
 public:
   //! an enumerator for different types of view
@@ -85 +85 @@
 {
   friend class Camera;             //! The CameraTarget is a friend of Camera. noone else needs a CameraTarget, so noone else can create it.
-  NewObjectListDeclaration(CameraTarget);
+  ObjectListDeclaration(CameraTarget);
 
 private:

branches/new_class_id/src/world_entities/character_attributes.cc

@@ -20 +20 @@
 
 
-NewObjectListDefinition(CharacterAttributes);
+ObjectListDefinition(CharacterAttributes);
 
 

branches/new_class_id/src/world_entities/character_attributes.h

@@ -15 +15 @@
 */
 class CharacterAttributes : public BaseObject {
-    NewObjectListDeclaration(CharacterAttributes);
+    ObjectListDeclaration(CharacterAttributes);
 
  public:

branches/new_class_id/src/world_entities/creatures/fps_player.cc

@@ -42 +42 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
+ObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
 CREATE_FACTORY(FPSPlayer);
 

branches/new_class_id/src/world_entities/creatures/fps_player.h

@@ -16 +16 @@
 class FPSPlayer : public Playable
 {
-  NewObjectListDeclaration(FPSPlayer);
+  ObjectListDeclaration(FPSPlayer);
 
   public:

branches/new_class_id/src/world_entities/creatures/md2_creature.cc

@@ -38 +38 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
+ObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
 CREATE_FACTORY(MD2Creature);
 

branches/new_class_id/src/world_entities/creatures/md2_creature.h

@@ -16 +16 @@
 class MD2Creature : public Playable
 {
-  NewObjectListDeclaration(MD2Creature);
+  ObjectListDeclaration(MD2Creature);
 
   public:

branches/new_class_id/src/world_entities/effects/billboard.cc

@@ -27 +27 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Billboard, CL_BILLBOARD);
+ObjectListDefinitionID(Billboard, CL_BILLBOARD);
 CREATE_FACTORY(Billboard);
 

branches/new_class_id/src/world_entities/effects/billboard.h

@@ -13 +13 @@
 class Billboard : public WorldEntity
 {
-  NewObjectListDeclaration(Billboard);
+  ObjectListDeclaration(Billboard);
   public:
     Billboard(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/effects/explosion.cc

@@ -28 +28 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Explosion, CL_EXPLOSION);
+ObjectListDefinitionID(Explosion, CL_EXPLOSION);
 CREATE_FAST_FACTORY_STATIC(Explosion);
 

branches/new_class_id/src/world_entities/effects/explosion.h

@@ -15 +15 @@
 class Explosion : public WorldEntity
 {
-  NewObjectListDeclaration(Explosion);
+  ObjectListDeclaration(Explosion);
   public:
     static void explode (PNode* position, const Vector& size);

branches/new_class_id/src/world_entities/effects/lightning_bolt.cc

@@ -26 +26 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(LightningBolt, CL_LIGHTNING_BOLT);
+ObjectListDefinitionID(LightningBolt, CL_LIGHTNING_BOLT);
 CREATE_FACTORY(LightningBolt);
 

branches/new_class_id/src/world_entities/effects/lightning_bolt.h

@@ -2 +2 @@
  * @file lightning_bolt.h
  * @brief a LightningBolt Projectile
- *  Der Effekt soll folgendermaßen funktionieren:
+ *  Der Effekt soll folgenderma�n funktionieren:
  * -> Ein Partikel mit einer Blitz-Textur soll sehr schnell erscheinen,
- * -> während er an Intensität zunimmt soll die Beleuchtung der gerenderten Szene entsprechend zunehmen.
- * -> Je mehr Blitze zum gleichen Zeitpunkt sichtbar sind, desto heller soll die Beleuchtung werden, das heißt die Helligkeitszunahme pro Blitz soll Additiv sein.
+ * -> w�rend er an Intensit� zunimmt soll die Beleuchtung der gerenderten Szene entsprechend zunehmen.
+ * -> Je mehr Blitze zum gleichen Zeitpunkt sichtbar sind, desto heller soll die Beleuchtung werden, das hei� die Helligkeitszunahme pro Blitz soll Additiv sein.
  * -> Ein Partikel soll ebenfalls sehr schnell wieder verblassen, dabei soll die Beleuchtung entsprechend der vorhergehenden Zunahme wieder abnehmen (Additiv)
  */
@@ -21 +21 @@
 class LightningBolt : public WorldEntity
 {
-  NewObjectListDeclaration(LightningBolt);
+  ObjectListDeclaration(LightningBolt);
   public:
     LightningBolt(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/elements/image_entity.cc

@@ -31 +31 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(ImageEntity, CL_IMAGE_ENTITY);
+ObjectListDefinitionID(ImageEntity, CL_IMAGE_ENTITY);
 CREATE_FACTORY(ImageEntity);
 

branches/new_class_id/src/world_entities/elements/image_entity.h

@@ -21 +21 @@
 //! A class that enables the
 class ImageEntity : public PNode, public Element2D {
-  NewObjectListDeclaration(ImageEntity);
+  ObjectListDeclaration(ImageEntity);
 
  public:

branches/new_class_id/src/world_entities/elements/text_element.cc

@@ -28 +28 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
+ObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
 CREATE_FACTORY(TextElement);
 

branches/new_class_id/src/world_entities/elements/text_element.h

@@ -21 +21 @@
 //! A class that enables the
 class TextElement : public Text {
-  NewObjectListDeclaration(TextElement);
+  ObjectListDeclaration(TextElement);
 
  public:

branches/new_class_id/src/world_entities/environment.cc

@@ -27 +27 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Environment, CL_ENVIRONMENT);
+ObjectListDefinitionID(Environment, CL_ENVIRONMENT);
 CREATE_FACTORY(Environment);
 

branches/new_class_id/src/world_entities/environment.h

@@ -16 +16 @@
 class Environment : public WorldEntity
 {
-  NewObjectListDeclaration(Environment);
+  ObjectListDeclaration(Environment);
 
  public:

branches/new_class_id/src/world_entities/environments/building.cc

@@ -24 +24 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Building, CL_BUILDING);
+ObjectListDefinitionID(Building, CL_BUILDING);
 CREATE_FACTORY(Building);
 

branches/new_class_id/src/world_entities/environments/building.h

@@ -15 +15 @@
 class Building : public WorldEntity
 {
-  NewObjectListDeclaration(Building);
+  ObjectListDeclaration(Building);
   public:
   Building(const TiXmlElement* root);

branches/new_class_id/src/world_entities/environments/mapped_water.cc

@@ -26 +26 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(MappedWater, CL_MAPPED_WATER);
+ObjectListDefinitionID(MappedWater, CL_MAPPED_WATER);
 CREATE_FACTORY(MappedWater);
 

branches/new_class_id/src/world_entities/environments/mapped_water.h

@@ -35 +35 @@
 class MappedWater : public WorldEntity
 {
-  NewObjectListDeclaration(MappedWater);
+  ObjectListDeclaration(MappedWater);
 public:
   MappedWater(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/environments/model_entity.cc

@@ -24 +24 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(ModelEntity, CL_MODEL_ENTITY);
+ObjectListDefinitionID(ModelEntity, CL_MODEL_ENTITY);
 CREATE_FACTORY(ModelEntity);
 

branches/new_class_id/src/world_entities/environments/model_entity.h

@@ -15 +15 @@
 class ModelEntity : public WorldEntity
 {
-  NewObjectListDeclaration(ModelEntity);
+  ObjectListDeclaration(ModelEntity);
  public:
   ModelEntity(const TiXmlElement* root);

branches/new_class_id/src/world_entities/environments/water.cc

@@ -34 +34 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Water, CL_WATER);
+ObjectListDefinitionID(Water, CL_WATER);
 CREATE_FACTORY(Water);
 

branches/new_class_id/src/world_entities/environments/water.h

@@ -22 +22 @@
 class Water : public WorldEntity
 {
-  NewObjectListDeclaration(Water);
+  ObjectListDeclaration(Water);
   public:
    Water(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/extendable.cc

@@ -1 +1 @@
 #include "extendable.h"
 
-NewObjectListDefinition(Extendable);
+ObjectListDefinition(Extendable);

branches/new_class_id/src/world_entities/extendable.h

@@ -16 +16 @@
 //! A class for Extendable Entities
 class Extendable : virtual public BaseObject {
-  NewObjectListDeclaration(Extendable);
+  ObjectListDeclaration(Extendable);
 
   public:

branches/new_class_id/src/world_entities/movie_entity.cc

@@ -22 +22 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(MovieEntity, CL_MOVIE_ENTITY);
+ObjectListDefinitionID(MovieEntity, CL_MOVIE_ENTITY);
 CREATE_FACTORY(MovieEntity);
 

branches/new_class_id/src/world_entities/movie_entity.h

@@ -14 +14 @@
 class MovieEntity : public WorldEntity
 {
-  NewObjectListDeclaration(MovieEntity);
+  ObjectListDeclaration(MovieEntity);
   private:
     MediaContainer* media_container;

branches/new_class_id/src/world_entities/npcs/attractor_mine.cc

@@ -34 +34 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
+ObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
 CREATE_FACTORY(AttractorMine);
 #include "script_class.h"

branches/new_class_id/src/world_entities/npcs/attractor_mine.h

@@ -9 +9 @@
 
 class AttractorMine : public NPC {
-  NewObjectListDeclaration(AttractorMine);
+  ObjectListDeclaration(AttractorMine);
 
  public:

branches/new_class_id/src/world_entities/npcs/door.cc

@@ -27 +27 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Door, CL_DOOR);
+ObjectListDefinitionID(Door, CL_DOOR);
 CREATE_FACTORY(Door);
 
@@ -159 +159 @@
   float distance;
 
-  for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
        it != Playable::objectList().end();
        ++it)
@@ -173 +173 @@
 
 
-  for (NewObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
+  for (ObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
        it != GenericNPC::objectList().end();
        ++it)

branches/new_class_id/src/world_entities/npcs/door.h

@@ -21 +21 @@
 class Door : public WorldEntity
 {
-  NewObjectListDeclaration(Door);
+  ObjectListDeclaration(Door);
 
   public:

branches/new_class_id/src/world_entities/npcs/gate.cc

@@ -32 +32 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Gate, CL_GATE);
+ObjectListDefinitionID(Gate, CL_GATE);
 CREATE_FACTORY(Gate);
 
@@ -200 +200 @@
 
   // for all players
-  for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
        it != Playable::objectList().end();
        ++it)
@@ -212 +212 @@
 
 
-  for (NewObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
+  for (ObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
        it != GenericNPC::objectList().end();
        ++it)

branches/new_class_id/src/world_entities/npcs/gate.h

@@ -22 +22 @@
 class Gate : public WorldEntity
 {
-  NewObjectListDeclaration(Gate);
+  ObjectListDeclaration(Gate);
 
   public:

branches/new_class_id/src/world_entities/npcs/generic_npc.cc

@@ -33 +33 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
+ObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
 CREATE_FACTORY(GenericNPC);
 

branches/new_class_id/src/world_entities/npcs/generic_npc.h

@@ -25 +25 @@
 class GenericNPC : public NPC
 {
-  NewObjectListDeclaration(GenericNPC);
+  ObjectListDeclaration(GenericNPC);
 
 

branches/new_class_id/src/world_entities/npcs/ground_turret.cc

@@ -31 +31 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
+ObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
 CREATE_FACTORY(GroundTurret);
 

branches/new_class_id/src/world_entities/npcs/ground_turret.h

@@ -14 +14 @@
 class GroundTurret : public NPC
 {
-  NewObjectListDeclaration(GroundTurret);
+  ObjectListDeclaration(GroundTurret);
 
 public:

branches/new_class_id/src/world_entities/npcs/network_turret.cc

@@ -32 +32 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
+ObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
 CREATE_FACTORY(NetworkTurret);
 

branches/new_class_id/src/world_entities/npcs/network_turret.h

@@ -14 +14 @@
 class NetworkTurret : public NPC
 {
-  NewObjectListDeclaration(NetworkTurret);
+  ObjectListDeclaration(NetworkTurret);
 public:
   NetworkTurret(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/npcs/npc.cc

@@ -20 +20 @@
 #include "npc.h"
 
-NewObjectListDefinition(NPC);
+ObjectListDefinition(NPC);
 
 NPC::NPC(const TiXmlElement* root)

branches/new_class_id/src/world_entities/npcs/npc.h

@@ -8 +8 @@
 
 class NPC : public WorldEntity {
-  NewObjectListDeclaration(NPC);
+  ObjectListDeclaration(NPC);
  public:
    NPC (const TiXmlElement* root);

branches/new_class_id/src/world_entities/npcs/npc_test.cc

@@ -31 +31 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(NPC2, CL_NPC_TEST2);
+ObjectListDefinitionID(NPC2, CL_NPC_TEST2);
 CREATE_FACTORY(NPC2);
 

branches/new_class_id/src/world_entities/npcs/npc_test.h

@@ -9 +9 @@
 
 class NPC2 : public NPC {
-  NewObjectListDeclaration(NPC2);
+  ObjectListDeclaration(NPC2);
 
  public:

branches/new_class_id/src/world_entities/npcs/npc_test1.cc

@@ -25 +25 @@
 #include "power_ups/laser_power_up.h"
 
-NewObjectListDefinition(NPCTest1);
+ObjectListDefinition(NPCTest1);
 
 NPCTest1::NPCTest1()

branches/new_class_id/src/world_entities/npcs/npc_test1.h

@@ -8 +8 @@
 
 class NPCTest1 : public NPC {
-  NewObjectListDeclaration(NPCTest1);
+  ObjectListDeclaration(NPCTest1);
  public:
   NPCTest1 ();

branches/new_class_id/src/world_entities/npcs/repair_station.cc

@@ -27 +27 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(RepairStation, CL_DOOR +1 );
+ObjectListDefinitionID(RepairStation, CL_DOOR +1 );
 CREATE_FACTORY(RepairStation);
 

branches/new_class_id/src/world_entities/npcs/repair_station.h

@@ -27 +27 @@
 class RepairStation : public WorldEntity
 {
-  NewObjectListDeclaration(RepairStation);
+  ObjectListDeclaration(RepairStation);
   public:
     RepairStation ();

branches/new_class_id/src/world_entities/npcs/space_turret.cc

@@ -30 +30 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
+ObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
 CREATE_FACTORY(SpaceTurret);
 

branches/new_class_id/src/world_entities/npcs/space_turret.h

@@ -18 +18 @@
 class SpaceTurret : public NPC
 {
-  NewObjectListDeclaration(SpaceTurret);
+  ObjectListDeclaration(SpaceTurret);
 
 public:

branches/new_class_id/src/world_entities/planet.cc

@@ -33 +33 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Planet, CL_PLANET);
+ObjectListDefinitionID(Planet, CL_PLANET);
 CREATE_FACTORY(Planet);
 

branches/new_class_id/src/world_entities/planet.h

@@ -16 +16 @@
 class Planet : public WorldEntity
 {
-  NewObjectListDeclaration(Planet);
+  ObjectListDeclaration(Planet);
 
  public:

branches/new_class_id/src/world_entities/playable.cc

@@ -41 +41 @@
 SHELL_COMMAND_STATIC(orxoWeapon, Playable, Playable::addSomeWeapons_CHEAT)
   ->setAlias("orxoWeapon");
-NewObjectListDefinition(Playable);
+ObjectListDefinition(Playable);
 
 Playable::Playable()

branches/new_class_id/src/world_entities/playable.h

@@ -27 +27 @@
 class Playable : public WorldEntity, public Extendable
 {
-  NewObjectListDeclaration(Playable);
+  ObjectListDeclaration(Playable);
 public:
   //! Defines the Playmode of an Entity.

branches/new_class_id/src/world_entities/player.cc

@@ -24 +24 @@
 #include "debug.h"
 
-NewObjectListDefinition(Player);
+ObjectListDefinition(Player);
 /**
  * creates a new Player
@@ -101 +101 @@
 {
   /// FIXME this should be in the ObjectManager
-  for (NewObjectList<Playable>::const_iterator node = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator node = Playable::objectList().begin();
        node != Playable::objectList().end();
        ++node)

branches/new_class_id/src/world_entities/player.h

@@ -23 +23 @@
 class Player : public EventListener
 {
-  NewObjectListDeclaration(Player);
+  ObjectListDeclaration(Player);
 
   public:

branches/new_class_id/src/world_entities/power_ups/laser_power_up.cc

@@ -25 +25 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
+ObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
 CREATE_FACTORY(LaserPowerUp);
 

branches/new_class_id/src/world_entities/power_ups/laser_power_up.h

@@ -13 +13 @@
 
 class LaserPowerUp : public PowerUp {
-  NewObjectListDeclaration(LaserPowerUp);
+  ObjectListDeclaration(LaserPowerUp);
 
  public:

branches/new_class_id/src/world_entities/power_ups/param_power_up.cc

@@ -28 +28 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
+ObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
 CREATE_FACTORY(ParamPowerUp);
 

branches/new_class_id/src/world_entities/power_ups/param_power_up.h

@@ -20 +20 @@
 
 class ParamPowerUp : public PowerUp {
-  NewObjectListDeclaration(ParamPowerUp);
+  ObjectListDeclaration(ParamPowerUp);
 
 public:

branches/new_class_id/src/world_entities/power_ups/power_up.cc

@@ -25 +25 @@
 
 
-NewObjectListDefinition(PowerUp);
+ObjectListDefinition(PowerUp);
 
 PowerUp::PowerUp(float r, float g, float b)

branches/new_class_id/src/world_entities/power_ups/power_up.h

@@ -21 +21 @@
 
 class PowerUp : public WorldEntity {
-  NewObjectListDeclaration(PowerUp);
+  ObjectListDeclaration(PowerUp);
 
 public:

branches/new_class_id/src/world_entities/power_ups/turret_power_up.cc

@@ -25 +25 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
+ObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
 CREATE_FACTORY(TurretPowerUp);
 

branches/new_class_id/src/world_entities/power_ups/turret_power_up.h

@@ -13 +13 @@
 
 class TurretPowerUp : public PowerUp {
-  NewObjectListDeclaration(TurretPowerUp);
+  ObjectListDeclaration(TurretPowerUp);
 
  public:

branches/new_class_id/src/world_entities/power_ups/weapon_power_up.cc

@@ -28 +28 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
+ObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
 CREATE_FACTORY(WeaponPowerUp);
 

branches/new_class_id/src/world_entities/power_ups/weapon_power_up.h

@@ -14 +14 @@
 
 class WeaponPowerUp : public PowerUp {
-NewObjectListDeclaration(WeaponPowerUp);
+ObjectListDeclaration(WeaponPowerUp);
 public:
   WeaponPowerUp(const TiXmlElement* root = NULL);

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

@@ -26 +26 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Bomb, CL_BOMB);
+ObjectListDefinitionID(Bomb, CL_BOMB);
 CREATE_FAST_FACTORY_STATIC(Bomb);
 

branches/new_class_id/src/world_entities/projectiles/bomb.h

@@ -17 +17 @@
 class Bomb : public Projectile
 {
-  NewObjectListDeclaration(Bomb);
+  ObjectListDeclaration(Bomb);
  public:
   Bomb(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/projectiles/boomerang_projectile.cc

@@ -27 +27 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
+ObjectListDefinitionID(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
 CREATE_FAST_FACTORY_STATIC(BoomerangProjectile);
 

branches/new_class_id/src/world_entities/projectiles/boomerang_projectile.h

@@ -17 +17 @@
 class BoomerangProjectile : public Projectile
 {
-  NewObjectListDeclaration(BoomerangProjectile);
+  ObjectListDeclaration(BoomerangProjectile);
   public:
     BoomerangProjectile ();

branches/new_class_id/src/world_entities/projectiles/guided_missile.cc

@@ -26 +26 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(GuidedMissile, CL_GUIDED_MISSILE);
+ObjectListDefinitionID(GuidedMissile, CL_GUIDED_MISSILE);
 CREATE_FAST_FACTORY_STATIC(GuidedMissile);
 

branches/new_class_id/src/world_entities/projectiles/guided_missile.h

@@ -16 +16 @@
 class GuidedMissile : public Projectile
 {
-  NewObjectListDeclaration(GuidedMissile);
+  ObjectListDeclaration(GuidedMissile);
   public:
     GuidedMissile ();

branches/new_class_id/src/world_entities/projectiles/hyperblast.cc

@@ -26 +26 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Hyperblast, CL_HYPERBLAST);
+ObjectListDefinitionID(Hyperblast, CL_HYPERBLAST);
 CREATE_FAST_FACTORY_STATIC(Hyperblast);
 

branches/new_class_id/src/world_entities/projectiles/hyperblast.h

@@ -17 +17 @@
 class Hyperblast : public Projectile
 {
-  NewObjectListDeclaration(Hyperblast);
+  ObjectListDeclaration(Hyperblast);
   public:
     Hyperblast ();

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

@@ -29 +29 @@
 
 #include "class_id.h"
-NewObjectListDefinition(Laser);
+ObjectListDefinition(Laser);
 CREATE_FAST_FACTORY_STATIC(Laser);
 

branches/new_class_id/src/world_entities/projectiles/laser.h

@@ -17 +17 @@
 class Laser : public Projectile
 {
-  NewObjectListDeclaration(Laser);
+  ObjectListDeclaration(Laser);
   public:
     Laser ();

branches/new_class_id/src/world_entities/projectiles/projectile.cc

@@ -26 +26 @@
 #include "debug.h"
 
-NewObjectListDefinition(Projectile);
+ObjectListDefinition(Projectile);
 
 /**

branches/new_class_id/src/world_entities/projectiles/projectile.h

@@ -18 +18 @@
 class Projectile : public WorldEntity
 {
-  NewObjectListDeclaration(Projectile);
+  ObjectListDeclaration(Projectile);
   public:
     Projectile ();

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

@@ -29 +29 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
+ObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
 CREATE_FAST_FACTORY_STATIC(RailProjectile);
 

branches/new_class_id/src/world_entities/projectiles/rail_projectile.h

@@ -17 +17 @@
 class RailProjectile : public Projectile
 {
-  NewObjectListDeclaration(RailProjectile);
+  ObjectListDeclaration(RailProjectile);
   public:
     RailProjectile ();

branches/new_class_id/src/world_entities/projectiles/rocket.cc

@@ -26 +26 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Rocket, CL_ROCKET);
+ObjectListDefinitionID(Rocket, CL_ROCKET);
 CREATE_FAST_FACTORY_STATIC(Rocket);
 

branches/new_class_id/src/world_entities/projectiles/rocket.h

@@ -15 +15 @@
 class Rocket : public Projectile
 {
-  NewObjectListDeclaration(Rocket);
+  ObjectListDeclaration(Rocket);
 
 public:

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

@@ -25 +25 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
+ObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
 CREATE_FAST_FACTORY_STATIC(TestBullet);
 

branches/new_class_id/src/world_entities/projectiles/test_bullet.h

@@ -17 +17 @@
 class TestBullet : public Projectile
 {
-  NewObjectListDeclaration(TestBullet);
+  ObjectListDeclaration(TestBullet);
 
   public:

branches/new_class_id/src/world_entities/recorder.cc

@@ -23 +23 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Recorder, CL_RECORDER);
+ObjectListDefinitionID(Recorder, CL_RECORDER);
 CREATE_FACTORY(Recorder);
 

branches/new_class_id/src/world_entities/recorder.h

@@ -20 +20 @@
 class Recorder : public WorldEntity
 {
-  NewObjectListDeclaration(Recorder);
+  ObjectListDeclaration(Recorder);
   public:
     Recorder (const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/satellite.cc

@@ -25 +25 @@
 
 
-NewObjectListDefinition(Satellite);
+ObjectListDefinition(Satellite);
 
 /**

branches/new_class_id/src/world_entities/satellite.h

@@ -19 +19 @@
 class Satellite : public WorldEntity
 {
-  NewObjectListDeclaration(Satellite);
+  ObjectListDeclaration(Satellite);
 
  public:

branches/new_class_id/src/world_entities/script_trigger.cc

@@ -20 +20 @@
 #include "state.h"
 
-NewObjectListDefinition(ScriptTrigger);
+ObjectListDefinition(ScriptTrigger);
 
 CREATE_SCRIPTABLE_CLASS(ScriptTrigger, ScriptTrigger::classID(),

branches/new_class_id/src/world_entities/script_trigger.h

@@ -18 +18 @@
 class ScriptTrigger : public WorldEntity
 {
-  NewObjectListDeclaration(ScriptTrigger);
+  ObjectListDeclaration(ScriptTrigger);
   public:
     ScriptTrigger(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/skybox.cc

@@ -32 +32 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(SkyBox, CL_SKYBOX);
+ObjectListDefinitionID(SkyBox, CL_SKYBOX);
 CREATE_FACTORY(SkyBox);
 

branches/new_class_id/src/world_entities/skybox.h

@@ -27 +27 @@
 class SkyBox : public WorldEntity
 {
-  NewObjectListDeclaration(SkyBox);
+  ObjectListDeclaration(SkyBox);
 public:
   SkyBox(const std::string& fileName = "");

branches/new_class_id/src/world_entities/skydome.cc

@@ -30 +30 @@
 
 
-NewObjectListDefinition(Skydome);
+ObjectListDefinition(Skydome);
 
 /**

branches/new_class_id/src/world_entities/skydome.h

@@ -21 +21 @@
 class Skydome : public WorldEntity
 {
-  NewObjectListDeclaration(Skydome);
+  ObjectListDeclaration(Skydome);
 public:
   Skydome();

branches/new_class_id/src/world_entities/skysphere.cc

@@ -32 +32 @@
 
 
-NewObjectListDefinition(Skysphere);
+ObjectListDefinition(Skysphere);
 
 /**

branches/new_class_id/src/world_entities/skysphere.h

@@ -24 +24 @@
 class Skysphere : public WorldEntity
 {
-  NewObjectListDeclaration(Skysphere);
+  ObjectListDeclaration(Skysphere);
 
  public:

branches/new_class_id/src/world_entities/space_ships/collision_probe.cc

@@ -25 +25 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
+ObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
 
 CREATE_FACTORY(CollisionProbe);

branches/new_class_id/src/world_entities/space_ships/collision_probe.h

@@ -13 +13 @@
 class CollisionProbe : public Playable
 {
-  NewObjectListDeclaration(CollisionProbe);
+  ObjectListDeclaration(CollisionProbe);
 
   public:

branches/new_class_id/src/world_entities/space_ships/cruizer.cc

@@ -35 +35 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Cruizer, CL_CRUIZER);
+ObjectListDefinitionID(Cruizer, CL_CRUIZER);
 CREATE_FACTORY(Cruizer);
 

branches/new_class_id/src/world_entities/space_ships/cruizer.h

@@ -16 +16 @@
 class Cruizer : public Playable
 {
-  NewObjectListDeclaration(Cruizer);
+  ObjectListDeclaration(Cruizer);
   public:
     Cruizer(const std::string& fileName);

branches/new_class_id/src/world_entities/space_ships/helicopter.cc

@@ -35 +35 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Helicopter, CL_HELICOPTER);
+ObjectListDefinitionID(Helicopter, CL_HELICOPTER);
 CREATE_FACTORY(Helicopter);
 #include "script_class.h"

branches/new_class_id/src/world_entities/space_ships/helicopter.h

@@ -17 +17 @@
 class Helicopter : public Playable
 {
-  NewObjectListDeclaration(Helicopter);
+  ObjectListDeclaration(Helicopter);
 
   public:

branches/new_class_id/src/world_entities/space_ships/hover.cc

@@ -35 +35 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Hover, CL_HOVER);
+ObjectListDefinitionID(Hover, CL_HOVER);
 CREATE_FACTORY(Hover);
 

branches/new_class_id/src/world_entities/space_ships/hover.h

@@ -15 +15 @@
 class Hover : public Playable
 {
-  NewObjectListDeclaration(Hover);
+  ObjectListDeclaration(Hover);
   public:
 

branches/new_class_id/src/world_entities/space_ships/space_ship.cc

@@ -54 +54 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
+ObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
 CREATE_FACTORY(SpaceShip);
 

branches/new_class_id/src/world_entities/space_ships/space_ship.h

@@ -19 +19 @@
 class SpaceShip : public Playable
 {
-  NewObjectListDeclaration(SpaceShip);
+  ObjectListDeclaration(SpaceShip);
 
   public:

branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.cc

@@ -39 +39 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
+ObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
 CREATE_FACTORY(Spacecraft2D);
 

branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.h

@@ -16 +16 @@
 class Spacecraft2D : public Playable
 {
-  NewObjectListDeclaration(Spacecraft2D);
+  ObjectListDeclaration(Spacecraft2D);
   public:
     Spacecraft2D(const std::string& fileName);

branches/new_class_id/src/world_entities/space_ships/turbine_hover.cc

@@ -35 +35 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TurbineHover, CL_TURBINE_HOVER);
+ObjectListDefinitionID(TurbineHover, CL_TURBINE_HOVER);
 CREATE_FACTORY(TurbineHover);
 

branches/new_class_id/src/world_entities/space_ships/turbine_hover.h

@@ -18 +18 @@
 class TurbineHover : public Playable
 {
-  NewObjectListDeclaration(TurbineHover);
+  ObjectListDeclaration(TurbineHover);
 public:
   TurbineHover(const std::string& fileName);

branches/new_class_id/src/world_entities/spawning_point.cc

@@ -34 +34 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(SpawningPoint, CL_SPAWNING_POINT);
+ObjectListDefinitionID(SpawningPoint, CL_SPAWNING_POINT);
 CREATE_FACTORY( SpawningPoint);
 /**
@@ -109 +109 @@
   bool found = false;
 
-  for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
        it != Playable::objectList().end();
        ++it)
@@ -160 +160 @@
       bool found = false;
 
-      for (NewObjectList<Playable>::const_iterator it2 = Playable::objectList().begin();
+      for (ObjectList<Playable>::const_iterator it2 = Playable::objectList().begin();
            it2 != Playable::objectList().end();
            ++it2)
@@ -235 +235 @@
   Playable      * playable = NULL;
 
-  for (NewObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
+  for (ObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
        it != SpawningPoint::objectList().end();
        ++it)
@@ -253 +253 @@
   }
 
-  for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
        it != Playable::objectList().end();
        ++it)

branches/new_class_id/src/world_entities/spawning_point.h

@@ -42 +42 @@
  */
 class SpawningPoint : public WorldEntity {
-  NewObjectListDeclaration(SpawningPoint);
+  ObjectListDeclaration(SpawningPoint);
   public:
     SpawningPoint(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/spectator.cc

@@ -23 +23 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Spectator, CL_SPECTATOR);
+ObjectListDefinitionID(Spectator, CL_SPECTATOR);
 CREATE_FACTORY(Spectator);
 

branches/new_class_id/src/world_entities/spectator.h

@@ -11 +11 @@
 class Spectator : public Playable
 {
-  NewObjectListDeclaration(Spectator);
+  ObjectListDeclaration(Spectator);
 
   public:

branches/new_class_id/src/world_entities/terrain.cc

@@ -35 +35 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Terrain, CL_TERRAIN);
+ObjectListDefinitionID(Terrain, CL_TERRAIN);
 CREATE_FACTORY(Terrain);
 

branches/new_class_id/src/world_entities/terrain.h

@@ -25 +25 @@
 class Terrain : public WorldEntity
 {
-  NewObjectListDeclaration(Terrain);
+  ObjectListDeclaration(Terrain);
 
  public:

branches/new_class_id/src/world_entities/test_entity.cc

@@ -36 +36 @@
 
 #include "class_id.h"
-NewObjectListDefinition(TestEntity);
+ObjectListDefinition(TestEntity);
 CREATE_FACTORY(TestEntity);
 

branches/new_class_id/src/world_entities/test_entity.h

@@ -15 +15 @@
 class TestEntity : public WorldEntity, public PhysicsInterface
 {
-  NewObjectListDeclaration(TestEntity);
+  ObjectListDeclaration(TestEntity);
  public:
   TestEntity ();

branches/new_class_id/src/world_entities/weapons/aim.cc

@@ -29 +29 @@
 
 
-NewObjectListDefinition(Aim);
+ObjectListDefinition(Aim);
 
 /**

branches/new_class_id/src/world_entities/weapons/aim.h

@@ -29 +29 @@
 class Aim : public PNode, public Element2D
 {
-  NewObjectListDeclaration(Aim);
+  ObjectListDeclaration(Aim);
 
 public:

branches/new_class_id/src/world_entities/weapons/aiming_system.cc

@@ -30 +30 @@
 
 
-NewObjectListDefinition(AimingSystem);
+ObjectListDefinition(AimingSystem);
 
 /**

branches/new_class_id/src/world_entities/weapons/aiming_system.h

@@ -21 +21 @@
 class AimingSystem : public WorldEntity
 {
-  NewObjectListDeclaration(AimingSystem);
+  ObjectListDeclaration(AimingSystem);
 
  public:

branches/new_class_id/src/world_entities/weapons/aiming_turret.cc

@@ -28 +28 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
+ObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
 CREATE_FACTORY(AimingTurret);
 

branches/new_class_id/src/world_entities/weapons/aiming_turret.h

@@ -13 +13 @@
 class AimingTurret : public Weapon
 {
-  NewObjectListDeclaration(AimingTurret);
+  ObjectListDeclaration(AimingTurret);
 
 public:

branches/new_class_id/src/world_entities/weapons/ammo_container.cc

@@ -23 +23 @@
 
 
-NewObjectListDefinition(AmmoContainer);
+ObjectListDefinition(AmmoContainer);
 /**
  * standard constructor
  * @todo this constructor is not jet implemented - do it
 */
-AmmoContainer::AmmoContainer (const NewClassID& projectileType, float maxEnergy)
+AmmoContainer::AmmoContainer (const ClassID& projectileType, float maxEnergy)
 {
   this->registerObject(this, AmmoContainer::_objectList);

branches/new_class_id/src/world_entities/weapons/ammo_container.h

@@ -17 +17 @@
 //! A class for Storing energy of Projectiles.
 class AmmoContainer : public BaseObject {
-  NewObjectListDeclaration(AmmoContainer);
+  ObjectListDeclaration(AmmoContainer);
 
  public:
-  AmmoContainer(const NewClassID& id, float maxEnergy = DEFAULT_MAX_ENERGY);
+  AmmoContainer(const ClassID& id, float maxEnergy = DEFAULT_MAX_ENERGY);
   virtual ~AmmoContainer();
 
   bool operator=(int projectileType) const { return (this->projectileType == projectileType); };
-  NewClassID getProjectileType() const { return this->projectileType; };
+  ClassID getProjectileType() const { return this->projectileType; };
 
   float increaseEnergy(float energy);
@@ -42 +42 @@
    float  maxEnergy;
 
-   NewClassID projectileType;
+   ClassID projectileType;
 };
 

branches/new_class_id/src/world_entities/weapons/boomerang_gun.cc

@@ -28 +28 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
+ObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
 CREATE_FACTORY(BoomerangGun);
 

branches/new_class_id/src/world_entities/weapons/boomerang_gun.h

@@ -11 +11 @@
 class BoomerangGun : public Weapon
   {
-    NewObjectListDeclaration(BoomerangGun);
+    ObjectListDeclaration(BoomerangGun);
   public:
     BoomerangGun ();

branches/new_class_id/src/world_entities/weapons/cannon.cc

@@ -37 +37 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Cannon, CL_CANNON);
+ObjectListDefinitionID(Cannon, CL_CANNON);
 CREATE_FACTORY(Cannon);
 

branches/new_class_id/src/world_entities/weapons/cannon.h

@@ -12 +12 @@
 class Cannon : public Weapon
   {
-    NewObjectListDeclaration(Cannon);
+    ObjectListDeclaration(Cannon);
   public:
     Cannon ();

branches/new_class_id/src/world_entities/weapons/crosshair.cc

@@ -26 +26 @@
 
 
-NewObjectListDefinition(Crosshair);
+ObjectListDefinition(Crosshair);
 /**
  * standart constructor

branches/new_class_id/src/world_entities/weapons/crosshair.h

@@ -22 +22 @@
 //! A class that enables the
 class Crosshair : public PNode, public Element2D, public EventListener {
-  NewObjectListDeclaration(Crosshair);
+  ObjectListDeclaration(Crosshair);
  public:
   Crosshair(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -40 +40 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
+ObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
 CREATE_FACTORY(FPSSniperRifle);
 

branches/new_class_id/src/world_entities/weapons/fps_sniper_rifle.h

@@ -39 +39 @@
 class FPSSniperRifle : public Weapon
   {
-    NewObjectListDeclaration(FPSSniperRifle);
+    ObjectListDeclaration(FPSSniperRifle);
 
   public:

branches/new_class_id/src/world_entities/weapons/hyperblaster.cc

@@ -36 +36 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
+ObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
 CREATE_FACTORY(Hyperblaster);
 

branches/new_class_id/src/world_entities/weapons/hyperblaster.h

@@ -12 +12 @@
 class Hyperblaster : public Weapon
   {
-    NewObjectListDeclaration(Hyperblaster);
+    ObjectListDeclaration(Hyperblaster);
     public:
     Hyperblaster (const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/weapons/laser_cannon.cc

@@ -32 +32 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
+ObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
 CREATE_FACTORY(LaserCannon);
 

branches/new_class_id/src/world_entities/weapons/laser_cannon.h

@@ -29 +29 @@
 class LaserCannon : public Weapon
   {
-    NewObjectListDeclaration(LaserCannon);
+    ObjectListDeclaration(LaserCannon);
     public:
     LaserCannon (const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/weapons/targeting_turret.cc

@@ -27 +27 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
+ObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
 CREATE_FACTORY(TargetingTurret);
 

branches/new_class_id/src/world_entities/weapons/targeting_turret.h

@@ -12 +12 @@
 class TargetingTurret : public Weapon
 {
-  NewObjectListDeclaration(TargetingTurret);
+  ObjectListDeclaration(TargetingTurret);
 public:
   TargetingTurret(const TiXmlElement* root = NULL);

branches/new_class_id/src/world_entities/weapons/test_gun.cc

@@ -34 +34 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TestGun, CL_TEST_GUN);
+ObjectListDefinitionID(TestGun, CL_TEST_GUN);
 CREATE_FACTORY(TestGun);
 /**

branches/new_class_id/src/world_entities/weapons/test_gun.h

@@ -37 +37 @@
 class TestGun : public Weapon
   {
-    NewObjectListDeclaration(TestGun);
+    ObjectListDeclaration(TestGun);
   public:
     TestGun (int leftRight);

branches/new_class_id/src/world_entities/weapons/turret.cc

@@ -28 +28 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Turret, CL_TURRET);
+ObjectListDefinitionID(Turret, CL_TURRET);
 CREATE_FACTORY(Turret);
 

branches/new_class_id/src/world_entities/weapons/turret.h

@@ -11 +11 @@
 class Turret : public Weapon
   {
-    NewObjectListDeclaration(Turret);
+    ObjectListDeclaration(Turret);
   public:
     Turret ();

branches/new_class_id/src/world_entities/weapons/weapon.cc

@@ -35 +35 @@
 #include "elements/glgui_energywidget.h"
 
-NewObjectListDefinition(Weapon);
+ObjectListDefinition(Weapon);
 
 ////////////////////
@@ -72 +72 @@
  * @returns the newly created Weapon.
  */
-Weapon* Weapon::createWeapon(const NewClassID& weaponID)
+Weapon* Weapon::createWeapon(const ClassID& weaponID)
 {
   BaseObject* createdObject = Factory::fabricate(weaponID);
@@ -179 +179 @@
  * What it does, is telling the Weapon what Projectiles it can Emit.
  */
-void Weapon::setProjectileType(const NewClassID& projectile)
+void Weapon::setProjectileType(const ClassID& projectile)
 {
   this->projectile = projectile;

branches/new_class_id/src/world_entities/weapons/weapon.h

@@ -83 +83 @@
 class Weapon : public WorldEntity
 {
-  NewObjectListDeclaration(Weapon);
+  ObjectListDeclaration(Weapon);
 
   public:
@@ -89 +89 @@
     Weapon ();
     virtual ~Weapon ();
-    static Weapon* createWeapon(const NewClassID& weaponID);
+    static Weapon* createWeapon(const ClassID& weaponID);
     static Weapon* createWeapon(const std::string& weaponName);
 
@@ -113 +113 @@
     /** @returns the Capabilities of this Weapon */
     inline long getCapability() const { return this->capability; };
-    void setProjectileType(const NewClassID& projectile);
+    void setProjectileType(const ClassID& projectile);
     void setProjectileTypeC(const std::string& projectile);
     /** @returns The projectile's classID */
-    inline NewClassID getProjectileType() { return this->projectile; };
+    inline ClassID getProjectileType() { return this->projectile; };
     /** @returns the FastFactory, that creates Projectiles of type getProjectile */
     inline FastFactory* getProjectileFactory() { return this->projectileFactory; };
@@ -233 +233 @@
     bool                   chargeable;                      //!< if the Weapon is charcheable (if true, the weapon will charge before it fires.)
 
-    NewClassID                projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
+    ClassID                projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
     FastFactory*           projectileFactory;               //!< A factory, that produces and handles the projectiles.
   };

branches/new_class_id/src/world_entities/weapons/weapon_manager.cc

@@ -31 +31 @@
 
 
-NewObjectListDefinition(WeaponManager);
+ObjectListDefinition(WeaponManager);
 /**
  * @brief this initializes the weaponManager for a given nnumber of weapon slots
@@ -311 +311 @@
  * @param ammo the ammo to increase
  */
-float WeaponManager::increaseAmmunition(const NewClassID& projectileType, float ammo)
+float WeaponManager::increaseAmmunition(const ClassID& projectileType, float ammo)
 {
   return this->getAmmoContainer(projectileType)->increaseEnergy(ammo);
@@ -523 +523 @@
 }
 
-CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(const NewClassID& projectileType)
+CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(const ClassID& projectileType)
 {
   for (unsigned int i = 0; i < this->ammo.size(); i++)

branches/new_class_id/src/world_entities/weapons/weapon_manager.h

@@ -39 +39 @@
  */
 class WeaponManager : public BaseObject {
-  NewObjectListDeclaration(WeaponManager);
+  ObjectListDeclaration(WeaponManager);
 
   //! an enumerator defining a Slot, where a Weapon can be stored inside.
@@ -90 +90 @@
     void changeWeaponConfig(int weaponConfig);
 
-    float increaseAmmunition(const NewClassID& projectileType, float ammo);
+    float increaseAmmunition(const ClassID& projectileType, float ammo);
     float inclreaseAmmunition(const Weapon* weapon, float ammo);
 
@@ -107 +107 @@
  // private:
     int getNextFreeSlot(int configID, long capability = WTYPE_ALL);
-    CountPointer<AmmoContainer>& getAmmoContainer(const NewClassID& projectileType);
+    CountPointer<AmmoContainer>& getAmmoContainer(const ClassID& projectileType);
     CountPointer<AmmoContainer>& getAmmoContainer(const Weapon* weapon);
 

branches/new_class_id/src/world_entities/world_entity.cc

@@ -48 +48 @@
 
 
-NewObjectListDefinition(WorldEntity);
+ObjectListDefinition(WorldEntity);
 /**
  *  Loads the WordEntity-specific Part of any derived Class
@@ -302 +302 @@
  *  @param target1 a filter target (classID)
  */
-void WorldEntity::subscribeReaction(CREngine::CRType type, const NewClassID& target1)
+void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1)
 {
   this->subscribeReaction(type);
@@ -316 +316 @@
  *  @param target1 a filter target (classID)
  */
-void WorldEntity::subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2)
+void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2)
 {
   this->subscribeReaction(type);
@@ -331 +331 @@
  *  @param target1 a filter target (classID)
  */
-void WorldEntity::subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2, const NewClassID& target3)
+void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3)
 {
   this->subscribeReaction(type);
@@ -347 +347 @@
  *  @param target1 a filter target (classID)
  */
-void WorldEntity::subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2, const NewClassID& target3, const NewClassID& target4)
+void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3, const ClassID& target4)
 {
   this->subscribeReaction(type);

branches/new_class_id/src/world_entities/world_entity.h

@@ -41 +41 @@
 class WorldEntity : public PNode
 {
-  NewObjectListDeclaration(WorldEntity);
+  ObjectListDeclaration(WorldEntity);
 public:
   WorldEntity();
@@ -83 +83 @@
   /* --- Collision Reaction Block --- */
   void subscribeReaction(CREngine::CRType type);
-  void subscribeReaction(CREngine::CRType type, const NewClassID& target1);
-  void subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2);
-  void subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2, const NewClassID& target3);
-  void subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2, const NewClassID& target3, const NewClassID& target4);
+  void subscribeReaction(CREngine::CRType type, const ClassID& target1);
+  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2);
+  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3);
+  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3, const ClassID& target4);
 
   void unsubscribeReaction(CREngine::CRType type);