Index: branches/new_class_id/src/defs/class_id.h
===================================================================
--- branches/new_class_id/src/defs/class_id.h	(revision 9714)
+++ branches/new_class_id/src/defs/class_id.h	(revision 9715)
@@ -62,5 +62,5 @@
  *    # max lowerClasses-count      = 3^16 = enough (they are Leaves, and may NOT be derived by any other class.)
  */
-typedef enum ClassID
+typedef enum ClassID_DEPRICATED
 {
   // the Nothing CLASS (NULL)
Index: branches/new_class_id/src/lib/collision_detection/aabb.cc
===================================================================
--- branches/new_class_id/src/lib/collision_detection/aabb.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/aabb.cc	(revision 9715)
@@ -21,5 +21,5 @@
 
 
-NewObjectListDefinition(AABB);
+ObjectListDefinition(AABB);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_detection/aabb.h
===================================================================
--- branches/new_class_id/src/lib/collision_detection/aabb.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/aabb.h	(revision 9715)
@@ -13,5 +13,5 @@
 //! A class representing an extended bounding volume tree: an obb tree
 class AABB : public BoundingVolume {
-  NewObjectListDeclaration(AABB);
+  ObjectListDeclaration(AABB);
 
  public:
Index: branches/new_class_id/src/lib/collision_detection/aabb_tree_node.cc
===================================================================
--- branches/new_class_id/src/lib/collision_detection/aabb_tree_node.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/aabb_tree_node.cc	(revision 9715)
@@ -34,5 +34,5 @@
 GLUquadricObj* AABBTreeNode_sphereObj = NULL;
 
-NewObjectListDefinition(AABBTreeNode);
+ObjectListDefinition(AABBTreeNode);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_detection/aabb_tree_node.h
===================================================================
--- branches/new_class_id/src/lib/collision_detection/aabb_tree_node.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/aabb_tree_node.h	(revision 9715)
@@ -21,5 +21,5 @@
 class AABBTreeNode : public BVTreeNode
 {
-  NewObjectListDeclaration(AABBTreeNode);
+  ObjectListDeclaration(AABBTreeNode);
 
 
Index: branches/new_class_id/src/lib/collision_detection/bounding_sphere.cc
===================================================================
--- branches/new_class_id/src/lib/collision_detection/bounding_sphere.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/bounding_sphere.cc	(revision 9715)
@@ -20,5 +20,5 @@
 
 
-NewObjectListDefinition(BoundingSphere);
+ObjectListDefinition(BoundingSphere);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_detection/bounding_sphere.h
===================================================================
--- branches/new_class_id/src/lib/collision_detection/bounding_sphere.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/bounding_sphere.h	(revision 9715)
@@ -14,5 +14,5 @@
 //! A class representing an extended bounding volume tree: an sphere
 class BoundingSphere : public BoundingVolume {
-  NewObjectListDeclaration(BoundingSphere);
+  ObjectListDeclaration(BoundingSphere);
 
  public:
Index: branches/new_class_id/src/lib/collision_detection/bounding_volume.cc
===================================================================
--- branches/new_class_id/src/lib/collision_detection/bounding_volume.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/bounding_volume.cc	(revision 9715)
@@ -20,5 +20,5 @@
 
 
-NewObjectListDefinition(BoundingVolume);
+ObjectListDefinition(BoundingVolume);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_detection/bounding_volume.h
===================================================================
--- branches/new_class_id/src/lib/collision_detection/bounding_volume.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/bounding_volume.h	(revision 9715)
@@ -17,5 +17,5 @@
 //! An abstract class representing a bounding volume
 class BoundingVolume : public BaseObject {
-  NewObjectListDeclaration(BoundingVolume);
+  ObjectListDeclaration(BoundingVolume);
 
   public:
Index: branches/new_class_id/src/lib/collision_detection/bv_tree.cc
===================================================================
--- branches/new_class_id/src/lib/collision_detection/bv_tree.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/bv_tree.cc	(revision 9715)
@@ -21,5 +21,5 @@
 
 
-NewObjectListDefinition(BVTree);
+ObjectListDefinition(BVTree);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_detection/bv_tree.h
===================================================================
--- branches/new_class_id/src/lib/collision_detection/bv_tree.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/bv_tree.h	(revision 9715)
@@ -36,5 +36,5 @@
 class BVTree : public BaseObject
 {
-  NewObjectListDeclaration(BVTree);
+  ObjectListDeclaration(BVTree);
 
   public:
Index: branches/new_class_id/src/lib/collision_detection/bv_tree_node.cc
===================================================================
--- branches/new_class_id/src/lib/collision_detection/bv_tree_node.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/bv_tree_node.cc	(revision 9715)
@@ -20,5 +20,5 @@
 
 
-NewObjectListDefinition(BVTreeNode);
+ObjectListDefinition(BVTreeNode);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_detection/bv_tree_node.h
===================================================================
--- branches/new_class_id/src/lib/collision_detection/bv_tree_node.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/bv_tree_node.h	(revision 9715)
@@ -24,5 +24,5 @@
 //! A class that represents a bounding volume tree
 class BVTreeNode : public BaseObject {
-  NewObjectListDeclaration(BVTreeNode);
+  ObjectListDeclaration(BVTreeNode);
 
 
Index: branches/new_class_id/src/lib/collision_detection/cd_engine.cc
===================================================================
--- branches/new_class_id/src/lib/collision_detection/cd_engine.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/cd_engine.cc	(revision 9715)
@@ -34,5 +34,5 @@
 
 
-NewObjectListDefinition(CDEngine);
+ObjectListDefinition(CDEngine);
 /**
  * @brief standard constructor
@@ -103,5 +103,5 @@
   std::list<WorldEntity*>::iterator entityIterator;
   // for all bsp managers check all entities
-  for( NewObjectList<BspEntity>::const_iterator bspIterator = BspEntity::objectList().begin();
+  for( ObjectList<BspEntity>::const_iterator bspIterator = BspEntity::objectList().begin();
        bspIterator != BspEntity::objectList().end();
        bspIterator++) {
Index: branches/new_class_id/src/lib/collision_detection/cd_engine.h
===================================================================
--- branches/new_class_id/src/lib/collision_detection/cd_engine.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/cd_engine.h	(revision 9715)
@@ -36,5 +36,5 @@
 //! The class representing the collision detection system of orxonox
 class CDEngine : public BaseObject {
-  NewObjectListDeclaration(CDEngine);
+  ObjectListDeclaration(CDEngine);
 
   friend class WorldEntity;
Index: branches/new_class_id/src/lib/collision_detection/obb.cc
===================================================================
--- branches/new_class_id/src/lib/collision_detection/obb.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/obb.cc	(revision 9715)
@@ -21,5 +21,5 @@
 
 
-NewObjectListDefinition(OBB);
+ObjectListDefinition(OBB);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_detection/obb.h
===================================================================
--- branches/new_class_id/src/lib/collision_detection/obb.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/obb.h	(revision 9715)
@@ -15,5 +15,5 @@
 //! A class representing an extended bounding volume tree: an obb tree
 class OBB : public BoundingVolume {
-  NewObjectListDeclaration(OBB);
+  ObjectListDeclaration(OBB);
 
  public:
Index: branches/new_class_id/src/lib/collision_detection/obb_tree.cc
===================================================================
--- branches/new_class_id/src/lib/collision_detection/obb_tree.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/obb_tree.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 
-NewObjectListDefinition(OBBTree);
+ObjectListDefinition(OBBTree);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_detection/obb_tree.h
===================================================================
--- branches/new_class_id/src/lib/collision_detection/obb_tree.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/obb_tree.h	(revision 9715)
@@ -20,5 +20,5 @@
 class OBBTree : public BVTree
 {
-  NewObjectListDeclaration(OBBTree);
+  ObjectListDeclaration(OBBTree);
 
   public:
Index: branches/new_class_id/src/lib/collision_detection/obb_tree_node.cc
===================================================================
--- branches/new_class_id/src/lib/collision_detection/obb_tree_node.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/obb_tree_node.cc	(revision 9715)
@@ -38,5 +38,5 @@
 GLUquadricObj* OBBTreeNode_sphereObj = NULL;
 
-NewObjectListDefinition(OBBTreeNode);
+ObjectListDefinition(OBBTreeNode);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_detection/obb_tree_node.h
===================================================================
--- branches/new_class_id/src/lib/collision_detection/obb_tree_node.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_detection/obb_tree_node.h	(revision 9715)
@@ -20,5 +20,5 @@
 class OBBTreeNode : public BVTreeNode
 {
-  NewObjectListDeclaration(OBBTreeNode);
+  ObjectListDeclaration(OBBTreeNode);
   public:
     OBBTreeNode(const OBBTree& tree, OBBTreeNode* prev, int depth);
Index: branches/new_class_id/src/lib/collision_reaction/collision_handle.cc
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/collision_handle.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/collision_handle.cc	(revision 9715)
@@ -30,5 +30,5 @@
 
 
-NewObjectListDefinition(CollisionHandle);
+ObjectListDefinition(CollisionHandle);
 
 /**
@@ -94,8 +94,8 @@
  *  @param classID the classid to look for
  */
-void CollisionHandle::addTarget(const NewClassID& target)
+void CollisionHandle::addTarget(const ClassID& target)
 {
   // make sure there is no dublicate
-  std::vector<NewClassID>::iterator it = this->targetList.begin();
+  std::vector<ClassID>::iterator it = this->targetList.begin();
   for( ; it < this->targetList.end(); it++)
     if( (*it) == target)
@@ -227,5 +227,5 @@
 bool CollisionHandle::filterCollisionEvent(CollisionEvent* collisionEvent)
 {
-  std::vector<NewClassID>::iterator it = this->targetList.begin();
+  std::vector<ClassID>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)
   {
@@ -276,5 +276,5 @@
 bool CollisionHandle::filterCollision(Collision* collision)
 {
-  std::vector<NewClassID>::iterator it = this->targetList.begin();
+  std::vector<ClassID>::iterator it = this->targetList.begin();
   for(; it < this->targetList.end(); it++)
   {
Index: branches/new_class_id/src/lib/collision_reaction/collision_handle.h
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/collision_handle.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/collision_handle.h	(revision 9715)
@@ -23,5 +23,5 @@
 class CollisionHandle : public BaseObject
 {
-  NewObjectListDeclaration(CollisionHandle);
+  ObjectListDeclaration(CollisionHandle);
   public:
     CollisionHandle(WorldEntity* owner, CREngine::CRType type);
@@ -30,5 +30,5 @@
     void reset();
 
-    void addTarget(const NewClassID& target);
+    void addTarget(const ClassID& target);
     Collision* registerCollision(WorldEntity* entityA, WorldEntity* entityB);
     void registerSharedCollision(Collision* collision);
@@ -64,5 +64,5 @@
 
     std::vector<Collision*>       collisionList;           //!< a list full of collisions
-    std::vector<NewClassID>          targetList;              //!< a list of target classes for filtering @TODO TAKE SET INSTEAD OF VECTOR HERE
+    std::vector<ClassID>          targetList;              //!< a list of target classes for filtering @TODO TAKE SET INSTEAD OF VECTOR HERE
 
     CollisionReaction*            collisionReaction;       //!< reference to the collision reaction object
Index: branches/new_class_id/src/lib/collision_reaction/collision_reaction.cc
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/collision_reaction.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/collision_reaction.cc	(revision 9715)
@@ -20,5 +20,5 @@
 
 
-NewObjectListDefinition(CollisionReaction);
+ObjectListDefinition(CollisionReaction);
 
 /**
Index: branches/new_class_id/src/lib/collision_reaction/collision_reaction.h
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/collision_reaction.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/collision_reaction.h	(revision 9715)
@@ -18,5 +18,5 @@
 class CollisionReaction : public BaseObject
 {
-  NewObjectListDeclaration(CollisionReaction);
+  ObjectListDeclaration(CollisionReaction);
   public:
     CollisionReaction();
Index: branches/new_class_id/src/lib/collision_reaction/cr_engine.cc
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/cr_engine.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/cr_engine.cc	(revision 9715)
@@ -29,5 +29,5 @@
 
 
-NewObjectListDefinition(CREngine);
+ObjectListDefinition(CREngine);
 /**
  * standard constructor
Index: branches/new_class_id/src/lib/collision_reaction/cr_engine.h
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/cr_engine.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/cr_engine.h	(revision 9715)
@@ -25,5 +25,5 @@
 class CREngine : public BaseObject
 {
-  NewObjectListDeclaration(CREngine);
+  ObjectListDeclaration(CREngine);
 
   public:
Index: branches/new_class_id/src/lib/collision_reaction/cr_object_damage.cc
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/cr_object_damage.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/cr_object_damage.cc	(revision 9715)
@@ -28,5 +28,5 @@
 
 
-NewObjectListDefinition(CRObjectDamage);
+ObjectListDefinition(CRObjectDamage);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_reaction/cr_object_damage.h
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/cr_object_damage.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/cr_object_damage.h	(revision 9715)
@@ -15,5 +15,5 @@
 class CRObjectDamage : public CollisionReaction
 {
-  NewObjectListDeclaration(CRObjectDamage);
+  ObjectListDeclaration(CRObjectDamage);
   public:
     CRObjectDamage();
Index: branches/new_class_id/src/lib/collision_reaction/cr_physics_full_walk.cc
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/cr_physics_full_walk.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/cr_physics_full_walk.cc	(revision 9715)
@@ -35,5 +35,5 @@
 
 
-NewObjectListDefinition(CRPhysicsFullWalk);
+ObjectListDefinition(CRPhysicsFullWalk);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_reaction/cr_physics_full_walk.h
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/cr_physics_full_walk.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/cr_physics_full_walk.h	(revision 9715)
@@ -15,5 +15,5 @@
 class CRPhysicsFullWalk : public CollisionReaction
 {
-  NewObjectListDeclaration(CRPhysicsFullWalk);
+  ObjectListDeclaration(CRPhysicsFullWalk);
   public:
     CRPhysicsFullWalk();
Index: branches/new_class_id/src/lib/collision_reaction/cr_physics_ground_walk.cc
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/cr_physics_ground_walk.cc	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/cr_physics_ground_walk.cc	(revision 9715)
@@ -35,5 +35,5 @@
 
 
-NewObjectListDefinition(CRPhysicsGroundWalk);
+ObjectListDefinition(CRPhysicsGroundWalk);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/collision_reaction/cr_physics_ground_walk.h
===================================================================
--- branches/new_class_id/src/lib/collision_reaction/cr_physics_ground_walk.h	(revision 9714)
+++ branches/new_class_id/src/lib/collision_reaction/cr_physics_ground_walk.h	(revision 9715)
@@ -15,5 +15,5 @@
 class CRPhysicsGroundWalk : public CollisionReaction
 {
-  NewObjectListDeclaration(CRPhysicsGroundWalk);
+  ObjectListDeclaration(CRPhysicsGroundWalk);
   public:
     CRPhysicsGroundWalk();
Index: branches/new_class_id/src/lib/coord/p_node.cc
===================================================================
--- branches/new_class_id/src/lib/coord/p_node.cc	(revision 9714)
+++ branches/new_class_id/src/lib/coord/p_node.cc	(revision 9715)
@@ -30,5 +30,5 @@
 
 
-NewObjectListDefinition(PNode);
+ObjectListDefinition(PNode);
 /**
  * @brief standard constructor
@@ -1107,5 +1107,5 @@
 }
 
-NewObjectListDefinition(NullParent);
+ObjectListDefinition(NullParent);
 
 NullParent::NullParent()
Index: branches/new_class_id/src/lib/coord/p_node.h
===================================================================
--- branches/new_class_id/src/lib/coord/p_node.h	(revision 9714)
+++ branches/new_class_id/src/lib/coord/p_node.h	(revision 9715)
@@ -75,5 +75,5 @@
 class PNode : virtual public BaseObject, virtual public Synchronizeable
 {
-  NewObjectListDeclaration(PNode);
+  ObjectListDeclaration(PNode);
 
 public:
@@ -263,5 +263,5 @@
 class NullParent : public PNode
 {
-  NewObjectListDeclaration(NullParent);
+  ObjectListDeclaration(NullParent);
   friend class PNode;
   NullParent();
Index: branches/new_class_id/src/lib/event/event_handler.cc
===================================================================
--- branches/new_class_id/src/lib/event/event_handler.cc	(revision 9714)
+++ branches/new_class_id/src/lib/event/event_handler.cc	(revision 9715)
@@ -29,5 +29,5 @@
 
 
-NewObjectListDefinition(EventHandler);
+ObjectListDefinition(EventHandler);
 /**
  * @brief standard constructor
Index: branches/new_class_id/src/lib/event/event_handler.h
===================================================================
--- branches/new_class_id/src/lib/event/event_handler.h	(revision 9714)
+++ branches/new_class_id/src/lib/event/event_handler.h	(revision 9715)
@@ -21,5 +21,5 @@
 class EventHandler : public BaseObject
 {
-  NewObjectListDeclaration(EventHandler);
+  ObjectListDeclaration(EventHandler);
 public:
   virtual ~EventHandler();
Index: branches/new_class_id/src/lib/event/event_listener.cc
===================================================================
--- branches/new_class_id/src/lib/event/event_listener.cc	(revision 9714)
+++ branches/new_class_id/src/lib/event/event_listener.cc	(revision 9715)
@@ -19,5 +19,5 @@
 #include "event_handler.h"
 
-NewObjectListDefinition(EventListener);
+ObjectListDefinition(EventListener);
 /**
  * @brief standard constructor
Index: branches/new_class_id/src/lib/event/event_listener.h
===================================================================
--- branches/new_class_id/src/lib/event/event_listener.h	(revision 9714)
+++ branches/new_class_id/src/lib/event/event_listener.h	(revision 9715)
@@ -14,5 +14,5 @@
 class EventListener : virtual public BaseObject
 {
-  NewObjectListDeclaration(EventListener);
+  ObjectListDeclaration(EventListener);
 public:
   EventListener();
Index: branches/new_class_id/src/lib/event/key_mapper.cc
===================================================================
--- branches/new_class_id/src/lib/event/key_mapper.cc	(revision 9714)
+++ branches/new_class_id/src/lib/event/key_mapper.cc	(revision 9715)
@@ -32,5 +32,5 @@
 
 
-NewObjectListDefinition(KeyMapper);
+ObjectListDefinition(KeyMapper);
 
 /* initialize all variables to a reasonable value*/
Index: branches/new_class_id/src/lib/event/key_mapper.h
===================================================================
--- branches/new_class_id/src/lib/event/key_mapper.h	(revision 9714)
+++ branches/new_class_id/src/lib/event/key_mapper.h	(revision 9715)
@@ -16,5 +16,5 @@
 class KeyMapper : public BaseObject
 {
-  NewObjectListDeclaration(KeyMapper);
+  ObjectListDeclaration(KeyMapper);
 public:
   //! A mapping from key-name to key-id
Index: branches/new_class_id/src/lib/graphics/effects/atmospheric_engine.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/atmospheric_engine.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/atmospheric_engine.cc	(revision 9715)
@@ -23,5 +23,5 @@
 #include "util/loading/factory.h"
 
-NewObjectListDefinition(AtmosphericEngine);
+ObjectListDefinition(AtmosphericEngine);
 
 /**
@@ -94,5 +94,5 @@
 void AtmosphericEngine::draw() const
 {
-  for (NewObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
+  for (ObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
        it != WeatherEffect::objectList().end();
        ++it)
@@ -108,5 +108,5 @@
 {
 
-  for (NewObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
+  for (ObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
        it != WeatherEffect::objectList().end();
        ++it)
Index: branches/new_class_id/src/lib/graphics/effects/atmospheric_engine.h
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/atmospheric_engine.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/atmospheric_engine.h	(revision 9715)
@@ -14,5 +14,5 @@
 class AtmosphericEngine : public BaseObject
 {
-  NewObjectListDeclaration(AtmosphericEngine);
+  ObjectListDeclaration(AtmosphericEngine);
   public:
     ~AtmosphericEngine();
Index: branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc	(revision 9715)
@@ -40,5 +40,5 @@
 float     CloudEffect::fadeTime;
 
-NewObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
+ObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
 
 
Index: branches/new_class_id/src/lib/graphics/effects/cloud_effect.h
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/cloud_effect.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/cloud_effect.h	(revision 9715)
@@ -37,5 +37,5 @@
 
 class CloudEffect : public WeatherEffect {
-  NewObjectListDeclaration(CloudEffect);
+  ObjectListDeclaration(CloudEffect);
 
 public:
Index: branches/new_class_id/src/lib/graphics/effects/fog_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/fog_effect.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/fog_effect.cc	(revision 9715)
@@ -22,5 +22,5 @@
 #include "cloud_effect.h"
 
-NewObjectListDefinition(FogEffect);
+ObjectListDefinition(FogEffect);
 // Define shell commands
 //SHELL_COMMAND(activate, FogEffect, activateFog);
Index: branches/new_class_id/src/lib/graphics/effects/fog_effect.h
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/fog_effect.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/fog_effect.h	(revision 9715)
@@ -15,5 +15,5 @@
 class FogEffect : public WeatherEffect
 {
-  NewObjectListDeclaration(FogEffect);
+  ObjectListDeclaration(FogEffect);
 public:
   FogEffect(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/lib/graphics/effects/graphics_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/graphics_effect.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/graphics_effect.cc	(revision 9715)
@@ -22,5 +22,5 @@
 #include "util/loading/load_param.h"
 
-NewObjectListDefinition(GraphicsEffect);
+ObjectListDefinition(GraphicsEffect);
 
 /**
Index: branches/new_class_id/src/lib/graphics/effects/graphics_effect.h
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/graphics_effect.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/graphics_effect.h	(revision 9715)
@@ -13,5 +13,5 @@
 //! A class that handles GraphicsEffects. The GraphicsEffectManager operates on this.
 class GraphicsEffect : public BaseObject {
-  NewObjectListDeclaration(GraphicsEffect);
+  ObjectListDeclaration(GraphicsEffect);
   public:
     GraphicsEffect(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/lib/graphics/effects/lense_flare.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/lense_flare.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/lense_flare.cc	(revision 9715)
@@ -35,5 +35,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);
+ObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);
 CREATE_FACTORY(LenseFlare);
 
Index: branches/new_class_id/src/lib/graphics/effects/lense_flare.h
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/lense_flare.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/lense_flare.h	(revision 9715)
@@ -26,5 +26,5 @@
 class LenseFlare : public GraphicsEffect
 {
-  NewObjectListDeclaration(LenseFlare);
+  ObjectListDeclaration(LenseFlare);
   public:
     LenseFlare(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc	(revision 9715)
@@ -29,5 +29,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
+ObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
 
 SHELL_COMMAND(activate, LightningEffect, activateLightning);
Index: branches/new_class_id/src/lib/graphics/effects/lightning_effect.h
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/lightning_effect.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/lightning_effect.h	(revision 9715)
@@ -19,5 +19,5 @@
 class LightningEffect : public WeatherEffect
 {
-  NewObjectListDeclaration(LightningEffect);
+  ObjectListDeclaration(LightningEffect);
 public:
   LightningEffect(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/lib/graphics/effects/rain_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/rain_effect.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/rain_effect.cc	(revision 9715)
@@ -33,5 +33,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
+ObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
 
 // Define shell commands
Index: branches/new_class_id/src/lib/graphics/effects/rain_effect.h
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/rain_effect.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/rain_effect.h	(revision 9715)
@@ -25,5 +25,5 @@
 class RainEffect : public WeatherEffect
 {
-  NewObjectListDeclaration(RainEffect);
+  ObjectListDeclaration(RainEffect);
 public:
   RainEffect(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/lib/graphics/effects/snow_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/snow_effect.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/snow_effect.cc	(revision 9715)
@@ -32,5 +32,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
+ObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
 SHELL_COMMAND(activate, SnowEffect, activateSnow);
 SHELL_COMMAND(deactivate, SnowEffect, deactivateSnow);
Index: branches/new_class_id/src/lib/graphics/effects/snow_effect.h
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/snow_effect.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/snow_effect.h	(revision 9715)
@@ -23,5 +23,5 @@
 class SnowEffect : public WeatherEffect
 {
-  NewObjectListDeclaration(SnowEffect);
+  ObjectListDeclaration(SnowEffect);
 public:
   SnowEffect(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/lib/graphics/effects/volfog_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/volfog_effect.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/volfog_effect.cc	(revision 9715)
@@ -48,5 +48,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(VolFogEffect, CL_VOLFOG_EFFECT);
+ObjectListDefinitionID(VolFogEffect, CL_VOLFOG_EFFECT);
 CREATE_FACTORY(VolFogEffect);
 
Index: branches/new_class_id/src/lib/graphics/effects/volfog_effect.h
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/volfog_effect.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/volfog_effect.h	(revision 9715)
@@ -13,5 +13,5 @@
 class VolFogEffect : public WeatherEffect
 {
-  NewObjectListDeclaration(VolFogEffect);
+  ObjectListDeclaration(VolFogEffect);
 public:
   VolFogEffect(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/lib/graphics/effects/weather_effect.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/weather_effect.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/weather_effect.cc	(revision 9715)
@@ -20,5 +20,5 @@
 #include "util/loading/load_param.h"
 
-NewObjectListDefinition(WeatherEffect);
+ObjectListDefinition(WeatherEffect);
 
 /**
Index: branches/new_class_id/src/lib/graphics/effects/weather_effect.h
===================================================================
--- branches/new_class_id/src/lib/graphics/effects/weather_effect.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/effects/weather_effect.h	(revision 9715)
@@ -12,5 +12,5 @@
 class WeatherEffect : public BaseObject
 {
-  NewObjectListDeclaration(WeatherEffect);
+  ObjectListDeclaration(WeatherEffect);
 
   public:
Index: branches/new_class_id/src/lib/graphics/graphics_engine.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/graphics_engine.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/graphics_engine.cc	(revision 9715)
@@ -53,5 +53,5 @@
 SHELL_COMMAND(fps, GraphicsEngine, toggleFPSdisplay);
 
-NewObjectListDefinition(GraphicsEngine);
+ObjectListDefinition(GraphicsEngine);
 
 /**
@@ -591,5 +591,5 @@
 
   // tick the graphics effects
-  for (NewObjectList<GraphicsEffect>::const_iterator it = GraphicsEffect::objectList().begin();
+  for (ObjectList<GraphicsEffect>::const_iterator it = GraphicsEffect::objectList().begin();
        it != GraphicsEffect::objectList().end();
        ++it)
Index: branches/new_class_id/src/lib/graphics/graphics_engine.h
===================================================================
--- branches/new_class_id/src/lib/graphics/graphics_engine.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/graphics_engine.h	(revision 9715)
@@ -30,5 +30,5 @@
 class GraphicsEngine : public EventListener
 {
-  NewObjectListDeclaration(GraphicsEngine);
+  ObjectListDeclaration(GraphicsEngine);
   public:
     virtual ~GraphicsEngine();
Index: branches/new_class_id/src/lib/graphics/importer/height_map.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/height_map.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/height_map.cc	(revision 9715)
@@ -327,5 +327,5 @@
 
 
-NewObjectListDefinition(HeightMap);
+ObjectListDefinition(HeightMap);
 
 
Index: branches/new_class_id/src/lib/graphics/importer/height_map.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/height_map.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/height_map.h	(revision 9715)
@@ -72,5 +72,5 @@
 class HeightMap : public VertexArrayModel
 {
-  NewObjectListDeclaration(HeightMap);
+  ObjectListDeclaration(HeightMap);
   friend class Tile;
 
Index: branches/new_class_id/src/lib/graphics/importer/interactive_model.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/interactive_model.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/interactive_model.cc	(revision 9715)
@@ -22,5 +22,5 @@
 
 
-NewObjectListDefinition(InteractiveModel);
+ObjectListDefinition(InteractiveModel);
 
 /**
Index: branches/new_class_id/src/lib/graphics/importer/interactive_model.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/interactive_model.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/interactive_model.h	(revision 9715)
@@ -30,5 +30,5 @@
 class InteractiveModel : public Model
 {
-  NewObjectListDeclaration(InteractiveModel);
+  ObjectListDeclaration(InteractiveModel);
   public:
     InteractiveModel();
Index: branches/new_class_id/src/lib/graphics/importer/material.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/material.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/material.cc	(revision 9715)
@@ -27,5 +27,5 @@
 #include "util/loading/resource_manager.h"
 
-NewObjectListDefinition(Material);
+ObjectListDefinition(Material);
 
 /**
Index: branches/new_class_id/src/lib/graphics/importer/material.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/material.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/material.h	(revision 9715)
@@ -24,5 +24,5 @@
 class Material : public BaseObject
 {
-  NewObjectListDeclaration(Material);
+  ObjectListDeclaration(Material);
 public:
   Material (const std::string& mtlName = "");
Index: branches/new_class_id/src/lib/graphics/importer/md2/md2Model.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/md2/md2Model.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/md2/md2Model.cc	(revision 9715)
@@ -22,5 +22,5 @@
 
 
-NewObjectListDefinition(MD2Model);
+ObjectListDefinition(MD2Model);
 
 //! the model anorms
Index: branches/new_class_id/src/lib/graphics/importer/md2/md2Model.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/md2/md2Model.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/md2/md2Model.h	(revision 9715)
@@ -149,5 +149,5 @@
 //! This is a MD2 Model class
 class MD2Model : public InteractiveModel {
-  NewObjectListDeclaration(MD2Model);
+  ObjectListDeclaration(MD2Model);
 public:
   MD2Model(const std::string& modelFileName, const std::string& skinFileName = "", float scale = 1.0f);
Index: branches/new_class_id/src/lib/graphics/importer/media_container.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/media_container.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/media_container.cc	(revision 9715)
@@ -30,5 +30,5 @@
 #include "debug.h"
 
-NewObjectListDefinition(MediaContainer);
+ObjectListDefinition(MediaContainer);
 
 /**
Index: branches/new_class_id/src/lib/graphics/importer/media_container.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/media_container.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/media_container.h	(revision 9715)
@@ -24,5 +24,5 @@
 class MediaContainer : public TextureSequence
 {
-  NewObjectListDeclaration(MediaContainer);
+  ObjectListDeclaration(MediaContainer);
 private:
 
Index: branches/new_class_id/src/lib/graphics/importer/model.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/model.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/model.cc	(revision 9715)
@@ -20,5 +20,5 @@
 #include "glincl.h"
 
-NewObjectListDefinition(Model);
+ObjectListDefinition(Model);
 
 /**
Index: branches/new_class_id/src/lib/graphics/importer/model.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/model.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/model.h	(revision 9715)
@@ -54,5 +54,5 @@
 //! This class defines the basic components of a model
 class Model : virtual public BaseObject {
-  NewObjectListDeclaration(Model);
+  ObjectListDeclaration(Model);
 
   public:
Index: branches/new_class_id/src/lib/graphics/importer/movie_player.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/movie_player.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/movie_player.cc	(revision 9715)
@@ -30,5 +30,5 @@
 #include "debug.h"
 
-NewObjectListDefinition(MoviePlayer);
+ObjectListDefinition(MoviePlayer);
 
 MoviePlayer::MoviePlayer(const std::string& filename)
Index: branches/new_class_id/src/lib/graphics/importer/movie_player.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/movie_player.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/movie_player.h	(revision 9715)
@@ -31,5 +31,5 @@
 class MoviePlayer : public BaseObject
 {
-  NewObjectListDeclaration(MoviePlayer);
+  ObjectListDeclaration(MoviePlayer);
 
 private:
Index: branches/new_class_id/src/lib/graphics/importer/objModel.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/objModel.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/objModel.cc	(revision 9715)
@@ -27,5 +27,5 @@
 #include "compiler.h"
 
-NewObjectListDefinition(OBJModel);
+ObjectListDefinition(OBJModel);
 /**
  * @brief Crates a 3D-Model, loads in a File and scales it.
Index: branches/new_class_id/src/lib/graphics/importer/objModel.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/objModel.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/objModel.h	(revision 9715)
@@ -12,5 +12,5 @@
 class OBJModel : public StaticModel
 {
-  NewObjectListDeclaration(OBJModel);
+  ObjectListDeclaration(OBJModel);
   public:
    OBJModel(const std::string& fileName, float scaling = 1.0);
Index: branches/new_class_id/src/lib/graphics/importer/static_model.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/static_model.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/static_model.cc	(revision 9715)
@@ -134,5 +134,5 @@
 /// MODEL ///
 /////////////
-NewObjectListDefinition(StaticModel);
+ObjectListDefinition(StaticModel);
 
 /**
Index: branches/new_class_id/src/lib/graphics/importer/static_model.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/static_model.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/static_model.h	(revision 9715)
@@ -94,5 +94,5 @@
 class StaticModel : public Model
 {
-  NewObjectListDeclaration(StaticModel);
+  ObjectListDeclaration(StaticModel);
   public:
   StaticModel(const std::string& modelName = "");
Index: branches/new_class_id/src/lib/graphics/importer/texture.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/texture.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/texture.cc	(revision 9715)
@@ -64,5 +64,5 @@
 #endif
 
-NewObjectListDefinition(Texture);
+ObjectListDefinition(Texture);
 
 /**
Index: branches/new_class_id/src/lib/graphics/importer/texture.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/texture.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/texture.h	(revision 9715)
@@ -20,5 +20,5 @@
 class Texture : public BaseObject
 {
-  NewObjectListDeclaration(Texture);
+  ObjectListDeclaration(Texture);
 public:
   Texture();
Index: branches/new_class_id/src/lib/graphics/importer/texture_sequence.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/texture_sequence.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/texture_sequence.cc	(revision 9715)
@@ -28,5 +28,5 @@
 #endif
 
-NewObjectListDefinition(TextureSequence);
+ObjectListDefinition(TextureSequence);
 
 /**
Index: branches/new_class_id/src/lib/graphics/importer/texture_sequence.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/texture_sequence.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/texture_sequence.h	(revision 9715)
@@ -15,5 +15,5 @@
 class TextureSequence : public Texture
 {
-  NewObjectListDeclaration(TextureSequence);
+  ObjectListDeclaration(TextureSequence);
   public:
     TextureSequence(unsigned int count = 0, ...);
Index: branches/new_class_id/src/lib/graphics/importer/vertex_array_model.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/vertex_array_model.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/vertex_array_model.cc	(revision 9715)
@@ -24,5 +24,5 @@
 
 
-NewObjectListDefinition(VertexArrayModel);
+ObjectListDefinition(VertexArrayModel);
 
 /////////////
Index: branches/new_class_id/src/lib/graphics/importer/vertex_array_model.h
===================================================================
--- branches/new_class_id/src/lib/graphics/importer/vertex_array_model.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/importer/vertex_array_model.h	(revision 9715)
@@ -27,5 +27,5 @@
 class VertexArrayModel : public Model
 {
-  NewObjectListDeclaration(VertexArrayModel);
+  ObjectListDeclaration(VertexArrayModel);
   public:
   VertexArrayModel();
Index: branches/new_class_id/src/lib/graphics/light.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/light.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/light.cc	(revision 9715)
@@ -29,5 +29,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(Light, CL_LIGHT);
+ObjectListDefinitionID(Light, CL_LIGHT);
 CREATE_FACTORY(Light);
 
@@ -215,5 +215,5 @@
 ** LIGHT-MANAGER **
 ******************/
-NewObjectListDefinition(LightManager);
+ObjectListDefinition(LightManager);
 /**
  *  standard constructor for a Light
Index: branches/new_class_id/src/lib/graphics/light.h
===================================================================
--- branches/new_class_id/src/lib/graphics/light.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/light.h	(revision 9715)
@@ -25,5 +25,5 @@
 class Light : public PNode
 {
-  NewObjectListDeclaration(Light);
+  ObjectListDeclaration(Light);
 public:
   Light(const TiXmlElement* root = NULL);
@@ -89,5 +89,5 @@
 class LightManager : public BaseObject
 {
-  NewObjectListDeclaration(LightManager);
+  ObjectListDeclaration(LightManager);
 
   friend class Light;
Index: branches/new_class_id/src/lib/graphics/render2D/element_2d.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/render2D/element_2d.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/render2D/element_2d.cc	(revision 9715)
@@ -35,5 +35,5 @@
 SHELL_COMMAND(debug, Element2D, debug2D);
 
-NewObjectListDefinition(Element2D);
+ObjectListDefinition(Element2D);
 
 
Index: branches/new_class_id/src/lib/graphics/render2D/element_2d.h
===================================================================
--- branches/new_class_id/src/lib/graphics/render2D/element_2d.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/render2D/element_2d.h	(revision 9715)
@@ -89,5 +89,5 @@
 class Element2D : virtual public BaseObject
 {
-  NewObjectListDeclaration(Element2D);
+  ObjectListDeclaration(Element2D);
 
 public:
Index: branches/new_class_id/src/lib/graphics/render2D/image_plane.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/render2D/image_plane.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/render2D/image_plane.cc	(revision 9715)
@@ -26,5 +26,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(ImagePlane, CL_IMAGE_PLANE);
+ObjectListDefinitionID(ImagePlane, CL_IMAGE_PLANE);
 CREATE_FACTORY(ImagePlane);
 
Index: branches/new_class_id/src/lib/graphics/render2D/image_plane.h
===================================================================
--- branches/new_class_id/src/lib/graphics/render2D/image_plane.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/render2D/image_plane.h	(revision 9715)
@@ -17,5 +17,5 @@
 class ImagePlane :  public Element2D
 {
-  NewObjectListDeclaration(ImagePlane);
+  ObjectListDeclaration(ImagePlane);
   public:
     ImagePlane(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/lib/graphics/render2D/render_2d.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/render2D/render_2d.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/render2D/render_2d.cc	(revision 9715)
@@ -21,5 +21,5 @@
 #include "element_2d.h"
 
-NewObjectListDefinition(Render2D);
+ObjectListDefinition(Render2D);
 
 
Index: branches/new_class_id/src/lib/graphics/render2D/render_2d.h
===================================================================
--- branches/new_class_id/src/lib/graphics/render2D/render_2d.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/render2D/render_2d.h	(revision 9715)
@@ -14,5 +14,5 @@
 class Render2D : public BaseObject
 {
-  NewObjectListDeclaration(Render2D);
+  ObjectListDeclaration(Render2D);
 
   friend class Element2D;
Index: branches/new_class_id/src/lib/graphics/shader.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/shader.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/shader.cc	(revision 9715)
@@ -33,5 +33,5 @@
 
 
-NewObjectListDefinition(Shader);
+ObjectListDefinition(Shader);
 
 /**
Index: branches/new_class_id/src/lib/graphics/shader.h
===================================================================
--- branches/new_class_id/src/lib/graphics/shader.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/shader.h	(revision 9715)
@@ -19,5 +19,5 @@
 class Shader : public BaseObject
 {
-  NewObjectListDeclaration(Shader);
+  ObjectListDeclaration(Shader);
 public:
   class Uniform
Index: branches/new_class_id/src/lib/graphics/spatial_separation/quadtree.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/spatial_separation/quadtree.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/spatial_separation/quadtree.cc	(revision 9715)
@@ -27,5 +27,5 @@
 #define QUADTREE_MATERIAL_COUNT       4
 
-NewObjectListDefinition(Quadtree);
+ObjectListDefinition(Quadtree);
 /**
  *  standard constructor
Index: branches/new_class_id/src/lib/graphics/spatial_separation/quadtree.h
===================================================================
--- branches/new_class_id/src/lib/graphics/spatial_separation/quadtree.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/spatial_separation/quadtree.h	(revision 9715)
@@ -21,5 +21,5 @@
 //! A class for quadtree separation of the world
 class Quadtree : public BaseObject {
-  NewObjectListDeclaration(Quadtree);
+  ObjectListDeclaration(Quadtree);
 
   public:
Index: branches/new_class_id/src/lib/graphics/spatial_separation/quadtree_node.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/spatial_separation/quadtree_node.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/spatial_separation/quadtree_node.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 
-NewObjectListDefinition(QuadtreeNode);
+ObjectListDefinition(QuadtreeNode);
 
 /**
Index: branches/new_class_id/src/lib/graphics/spatial_separation/quadtree_node.h
===================================================================
--- branches/new_class_id/src/lib/graphics/spatial_separation/quadtree_node.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/spatial_separation/quadtree_node.h	(revision 9715)
@@ -26,5 +26,5 @@
 //! A class for a Quadtree Node representation
 class QuadtreeNode : public BaseObject {
-  NewObjectListDeclaration(QuadtreeNode);
+  ObjectListDeclaration(QuadtreeNode);
 
   public:
Index: branches/new_class_id/src/lib/graphics/spatial_separation/spatial_separation.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/spatial_separation/spatial_separation.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/spatial_separation/spatial_separation.cc	(revision 9715)
@@ -24,5 +24,5 @@
 
 
-NewObjectListDefinition(SpatialSeparation);
+ObjectListDefinition(SpatialSeparation);
 
 /**
Index: branches/new_class_id/src/lib/graphics/spatial_separation/spatial_separation.h
===================================================================
--- branches/new_class_id/src/lib/graphics/spatial_separation/spatial_separation.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/spatial_separation/spatial_separation.h	(revision 9715)
@@ -19,5 +19,5 @@
 //! A class for spatial separation of vertices based arrays
 class SpatialSeparation : public BaseObject {
-  NewObjectListDeclaration(SpatialSeparation);
+  ObjectListDeclaration(SpatialSeparation);
 
   public:
Index: branches/new_class_id/src/lib/graphics/text_engine/font.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/text_engine/font.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/text_engine/font.cc	(revision 9715)
@@ -29,5 +29,5 @@
 #include "compiler.h"
 
-NewObjectListDefinition(Font);
+ObjectListDefinition(Font);
 
 Font::Font()
Index: branches/new_class_id/src/lib/graphics/text_engine/font.h
===================================================================
--- branches/new_class_id/src/lib/graphics/text_engine/font.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/text_engine/font.h	(revision 9715)
@@ -19,5 +19,5 @@
 class Font : public Material
 {
-  NewObjectListDeclaration(Font);
+  ObjectListDeclaration(Font);
 
 public:
Index: branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.cc	(revision 9715)
@@ -19,5 +19,5 @@
 #include "font.h"
 
-NewObjectListDefinition(LimitedWidthText);
+ObjectListDefinition(LimitedWidthText);
 /**
  * @brief creates a new Text Element
Index: branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.h
===================================================================
--- branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.h	(revision 9715)
@@ -14,5 +14,5 @@
 class LimitedWidthText : public Text
 {
-  NewObjectListDeclaration(LimitedWidthText);
+  ObjectListDeclaration(LimitedWidthText);
   public:
     typedef enum {
Index: branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.cc	(revision 9715)
@@ -19,5 +19,5 @@
 #include "font.h"
 
-NewObjectListDefinition(MultiLineText);
+ObjectListDefinition(MultiLineText);
 
 /**
Index: branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.h
===================================================================
--- branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.h	(revision 9715)
@@ -14,5 +14,5 @@
 class MultiLineText : public Text
 {
-  NewObjectListDeclaration(MultiLineText);
+  ObjectListDeclaration(MultiLineText);
   public:
     MultiLineText(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE, float lineWidth = 100.0);
Index: branches/new_class_id/src/lib/graphics/text_engine/text.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/text_engine/text.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/text_engine/text.cc	(revision 9715)
@@ -22,5 +22,5 @@
 #include "debug.h"
 
-NewObjectListDefinition(Text);
+ObjectListDefinition(Text);
 
 /**
Index: branches/new_class_id/src/lib/graphics/text_engine/text.h
===================================================================
--- branches/new_class_id/src/lib/graphics/text_engine/text.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/text_engine/text.h	(revision 9715)
@@ -26,5 +26,5 @@
 class Text : public Element2D
 {
-  NewObjectListDeclaration(Text);
+  ObjectListDeclaration(Text);
   public:
     Text(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE);
Index: branches/new_class_id/src/lib/graphics/text_engine/text_engine.cc
===================================================================
--- branches/new_class_id/src/lib/graphics/text_engine/text_engine.cc	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/text_engine/text_engine.cc	(revision 9715)
@@ -39,5 +39,5 @@
 /// TEXT-ENGINE ///
 ///////////////////
-NewObjectListDefinition(TextEngine);
+ObjectListDefinition(TextEngine);
 /**
  *  standard constructor
@@ -124,5 +124,5 @@
   PRINT(0)("Reference: %p; Text Counts: %d\n", this, Text::objectList().size());
 
-  for (NewObjectList<Text>::const_iterator it = Text::objectList().begin();
+  for (ObjectList<Text>::const_iterator it = Text::objectList().begin();
        it != Text::objectList().end();
        ++it)
Index: branches/new_class_id/src/lib/graphics/text_engine/text_engine.h
===================================================================
--- branches/new_class_id/src/lib/graphics/text_engine/text_engine.h	(revision 9714)
+++ branches/new_class_id/src/lib/graphics/text_engine/text_engine.h	(revision 9715)
@@ -24,5 +24,5 @@
 class TextEngine : public BaseObject
 {
-  NewObjectListDeclaration(TextEngine);
+  ObjectListDeclaration(TextEngine);
   public:
   virtual ~TextEngine();
Index: branches/new_class_id/src/lib/gui/gl/glgui_bar.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_bar.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_bar.cc	(revision 9715)
@@ -23,5 +23,5 @@
 {
 
-  NewObjectListDefinition(GLGuiBar);
+  ObjectListDefinition(GLGuiBar);
   /**
    * @brief standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_bar.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_bar.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_bar.h	(revision 9715)
@@ -21,5 +21,5 @@
   class GLGuiBar : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiBar);
+    ObjectListDeclaration(GLGuiBar);
   public:
     GLGuiBar();
Index: branches/new_class_id/src/lib/gui/gl/glgui_box.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_box.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_box.cc	(revision 9715)
@@ -22,5 +22,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiBox);
+  ObjectListDefinition(GLGuiBox);
   /**
    * standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_box.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_box.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_box.h	(revision 9715)
@@ -19,5 +19,5 @@
   class GLGuiBox : public GLGuiContainer
   {
-    NewObjectListDeclaration(GLGuiBox);
+    ObjectListDeclaration(GLGuiBox);
   public:
     GLGuiBox(OrxGui::Orientation orientation = OrxGui::Vertical);
Index: branches/new_class_id/src/lib/gui/gl/glgui_button.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_button.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_button.cc	(revision 9715)
@@ -23,5 +23,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiButton);
+  ObjectListDefinition(GLGuiButton);
   /**
    * standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_button.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_button.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_button.h	(revision 9715)
@@ -31,5 +31,5 @@
   class GLGuiButton : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiButton);
+    ObjectListDeclaration(GLGuiButton);
     public:
       GLGuiButton(const std::string& label);
Index: branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.cc	(revision 9715)
@@ -22,5 +22,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiCheckButton);
+  ObjectListDefinition(GLGuiCheckButton);
 
   /**
Index: branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.h	(revision 9715)
@@ -21,5 +21,5 @@
   class GLGuiCheckButton : public GLGuiButton
   {
-    NewObjectListDeclaration(GLGuiCheckButton);
+    ObjectListDeclaration(GLGuiCheckButton);
   public:
     GLGuiCheckButton(const std::string& label = "", bool active = false);
Index: branches/new_class_id/src/lib/gui/gl/glgui_colorselector.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_colorselector.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_colorselector.h	(revision 9715)
@@ -21,5 +21,5 @@
   class GLGui : public GLGui
   {
-    NewObjectListDeclaration(GLGuiColorSelector);
+    ObjectListDeclaration(GLGuiColorSelector);
   public:
     GLGui();
Index: branches/new_class_id/src/lib/gui/gl/glgui_container.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_container.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_container.cc	(revision 9715)
@@ -20,5 +20,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiContainer);
+  ObjectListDefinition(GLGuiContainer);
   /**
    * standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_container.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_container.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_container.h	(revision 9715)
@@ -20,5 +20,5 @@
   class GLGuiContainer : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiContainer);
+    ObjectListDeclaration(GLGuiContainer);
   public:
     GLGuiContainer();
Index: branches/new_class_id/src/lib/gui/gl/glgui_cursor.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_cursor.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_cursor.cc	(revision 9715)
@@ -23,5 +23,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiCursor);
+  ObjectListDefinition(GLGuiCursor);
   /**
    * standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_cursor.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_cursor.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_cursor.h	(revision 9715)
@@ -26,5 +26,5 @@
   class GLGuiCursor : public GLGuiWidget, public EventListener
   {
-    NewObjectListDeclaration(GLGuiCursor);
+    ObjectListDeclaration(GLGuiCursor);
   public:
     GLGuiCursor();
Index: branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.cc	(revision 9715)
@@ -23,5 +23,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiFixedpositionBox);
+  ObjectListDefinition(GLGuiFixedpositionBox);
   /**
    * standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.h	(revision 9715)
@@ -21,5 +21,5 @@
   class GLGuiFixedpositionBox : public OrxGui::GLGuiBox, EventListener
   {
-    NewObjectListDeclaration(GLGuiFixedpositionBox);
+    ObjectListDeclaration(GLGuiFixedpositionBox);
     public:
       GLGuiFixedpositionBox(OrxGui::Position position = OrxGui::Center, OrxGui::Orientation orientation = OrxGui::Vertical);
Index: branches/new_class_id/src/lib/gui/gl/glgui_frame.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_frame.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_frame.cc	(revision 9715)
@@ -21,5 +21,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiFrame);
+  ObjectListDefinition(GLGuiFrame);
   /**
    * standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_frame.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_frame.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_frame.h	(revision 9715)
@@ -20,5 +20,5 @@
   class GLGuiFrame : public GLGuiContainer
   {
-    NewObjectListDeclaration(GLGuiFrame);
+    ObjectListDeclaration(GLGuiFrame);
   public:
     GLGuiFrame();
Index: branches/new_class_id/src/lib/gui/gl/glgui_handler.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_handler.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_handler.cc	(revision 9715)
@@ -34,5 +34,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiHandler);
+  ObjectListDefinition(GLGuiHandler);
   /**
    * standard constructor
@@ -116,5 +116,5 @@
   {
     // retrieve Objects.
-    NewObjectList<GLGuiWidget>::const_iterator it, currentIt;
+    ObjectList<GLGuiWidget>::const_iterator it, currentIt;
     currentIt = GLGuiWidget::objectList().end();
 
@@ -154,5 +154,5 @@
   void GLGuiHandler::selectPrevious()
   {
-    NewObjectList<GLGuiWidget>::const_iterator it, currentIt;
+    ObjectList<GLGuiWidget>::const_iterator it, currentIt;
     currentIt = GLGuiWidget::objectList().begin();
 
@@ -286,5 +286,5 @@
     if (this->_cursor != NULL)
     {
-      for (NewObjectList<GLGuiWidget>::const_iterator it = GLGuiWidget::objectList().begin();
+      for (ObjectList<GLGuiWidget>::const_iterator it = GLGuiWidget::objectList().begin();
 	   it != GLGuiWidget::objectList().end();
 	   it++)
Index: branches/new_class_id/src/lib/gui/gl/glgui_handler.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_handler.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_handler.h	(revision 9715)
@@ -19,5 +19,5 @@
   class GLGuiHandler : public EventListener
   {
-    NewObjectListDeclaration(GLGuiHandler);
+    ObjectListDeclaration(GLGuiHandler);
   public:
     /** @returns a Pointer to the only object of this Class */
Index: branches/new_class_id/src/lib/gui/gl/glgui_image.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_image.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_image.cc	(revision 9715)
@@ -22,5 +22,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiImage);
+  ObjectListDefinition(GLGuiImage);
   /**
    * standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_image.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_image.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_image.h	(revision 9715)
@@ -21,5 +21,5 @@
   class GLGuiImage : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiImage);
+    ObjectListDeclaration(GLGuiImage);
   public:
     GLGuiImage();
Index: branches/new_class_id/src/lib/gui/gl/glgui_inputline.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_inputline.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_inputline.cc	(revision 9715)
@@ -20,5 +20,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiInputLine);
+  ObjectListDefinition(GLGuiInputLine);
   /**
    * @brief standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_inputline.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_inputline.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_inputline.h	(revision 9715)
@@ -25,5 +25,5 @@
   class GLGuiInputLine : public OrxGui::GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiInputLine);
+    ObjectListDeclaration(GLGuiInputLine);
   public:
     GLGuiInputLine();
Index: branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.cc	(revision 9715)
@@ -20,5 +20,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiMainWidget);
+  ObjectListDefinition(GLGuiMainWidget);
 
   /**
Index: branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.h	(revision 9715)
@@ -15,5 +15,5 @@
   class GLGuiMainWidget : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiMainWidget);
+    ObjectListDeclaration(GLGuiMainWidget);
   public:
     virtual ~GLGuiMainWidget(void);
Index: branches/new_class_id/src/lib/gui/gl/glgui_menu.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_menu.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_menu.cc	(revision 9715)
@@ -20,5 +20,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiMenu);
+  ObjectListDefinition(GLGuiMenu);
   /**
    * standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_menu.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_menu.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_menu.h	(revision 9715)
@@ -19,5 +19,5 @@
   class GLGuiMenu : public GLGuiMenu
   {
-    NewObjectListDeclaration(GLGuiMenu);
+    ObjectListDeclaration(GLGuiMenu);
   public:
     GLGuiMenu();
Index: branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.cc	(revision 9715)
@@ -23,5 +23,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiPushButton);
+  ObjectListDefinition(GLGuiPushButton);
   /**
    * @brief standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.h	(revision 9715)
@@ -21,5 +21,5 @@
   class GLGuiPushButton : public GLGuiButton
   {
-    NewObjectListDeclaration(GLGuiPushButton);
+    ObjectListDeclaration(GLGuiPushButton);
   public:
     GLGuiPushButton(const std::string& label = "");
Index: branches/new_class_id/src/lib/gui/gl/glgui_slider.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_slider.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_slider.cc	(revision 9715)
@@ -23,5 +23,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiSlider);
+  ObjectListDefinition(GLGuiSlider);
   /**
    * @brief standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_slider.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_slider.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_slider.h	(revision 9715)
@@ -21,5 +21,5 @@
   class GLGuiSlider : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiSlider);
+    ObjectListDeclaration(GLGuiSlider);
   public:
     GLGuiSlider();
Index: branches/new_class_id/src/lib/gui/gl/glgui_table.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_table.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_table.cc	(revision 9715)
@@ -23,5 +23,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiTable);
+  ObjectListDefinition(GLGuiTable);
   /**
    * @brief standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_table.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_table.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_table.h	(revision 9715)
@@ -25,5 +25,5 @@
   class GLGuiTable : public OrxGui::GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiTable);
+    ObjectListDeclaration(GLGuiTable);
   public:
     GLGuiTable(unsigned int rows, unsigned int columns);
Index: branches/new_class_id/src/lib/gui/gl/glgui_text.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_text.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_text.cc	(revision 9715)
@@ -22,5 +22,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiText);
+  ObjectListDefinition(GLGuiText);
   /**
    * standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_text.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_text.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_text.h	(revision 9715)
@@ -20,5 +20,5 @@
   class GLGuiText : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiText);
+    ObjectListDeclaration(GLGuiText);
   public:
     GLGuiText();
Index: branches/new_class_id/src/lib/gui/gl/glgui_textfield.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_textfield.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_textfield.cc	(revision 9715)
@@ -22,5 +22,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiTextfield);
+  ObjectListDefinition(GLGuiTextfield);
   /**
    * standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_textfield.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_textfield.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_textfield.h	(revision 9715)
@@ -20,5 +20,5 @@
   class GLGuiTextfield : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiTextfield);
+    ObjectListDeclaration(GLGuiTextfield);
   public:
     GLGuiTextfield();
Index: branches/new_class_id/src/lib/gui/gl/glgui_widget.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_widget.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_widget.cc	(revision 9715)
@@ -31,5 +31,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiWidget);
+  ObjectListDefinition(GLGuiWidget);
   /**
    * @brief standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_widget.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_widget.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_widget.h	(revision 9715)
@@ -30,5 +30,5 @@
   class GLGuiWidget : public Element2D
   {
-    NewObjectListDeclaration(GLGuiWidget);
+    ObjectListDeclaration(GLGuiWidget);
   public:
     GLGuiWidget(GLGuiWidget* parent = NULL);
Index: branches/new_class_id/src/lib/gui/gl/glgui_window.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_window.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_window.cc	(revision 9715)
@@ -20,5 +20,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiWindow);
+  ObjectListDefinition(GLGuiWindow);
   /**
    * standard constructor
Index: branches/new_class_id/src/lib/gui/gl/glgui_window.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glgui_window.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glgui_window.h	(revision 9715)
@@ -20,5 +20,5 @@
   class GLGuiWindow : public GLGuiContainer
   {
-    NewObjectListDeclaration(GLGuiWindow);
+    ObjectListDeclaration(GLGuiWindow);
   public:
     GLGuiWindow();
Index: branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc	(revision 9715)
@@ -26,5 +26,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
+ObjectListDefinitionID(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
 CREATE_FACTORY(GLMenuImageScreen);
 
Index: branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.h	(revision 9715)
@@ -15,5 +15,5 @@
 class GLMenuImageScreen : public BaseObject
 {
-  NewObjectListDeclaration(GLMenuImageScreen);
+  ObjectListDeclaration(GLMenuImageScreen);
 public:
   GLMenuImageScreen (const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.cc
===================================================================
--- branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.cc	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.cc	(revision 9715)
@@ -23,5 +23,5 @@
 namespace OrxGui
 {
-  NewObjectListDefinition(GLGuiNotifier);
+  ObjectListDefinition(GLGuiNotifier);
   /**
    * @brief standard constructor
Index: branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.h
===================================================================
--- branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.h	(revision 9714)
+++ branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.h	(revision 9715)
@@ -24,5 +24,5 @@
   class GLGuiNotifier : public GLGuiWidget
   {
-    NewObjectListDeclaration(GLGuiNotifier);
+    ObjectListDeclaration(GLGuiNotifier);
   public:
     GLGuiNotifier();
Index: branches/new_class_id/src/lib/lang/base_object.cc
===================================================================
--- branches/new_class_id/src/lib/lang/base_object.cc	(revision 9714)
+++ branches/new_class_id/src/lib/lang/base_object.cc	(revision 9715)
@@ -21,5 +21,5 @@
 #include "util/loading/load_param.h"
 
-NewObjectListDefinition(BaseObject);
+ObjectListDefinition(BaseObject);
 
 /**
@@ -43,5 +43,5 @@
 BaseObject::~BaseObject ()
 {
-  /// Remove from the NewObjectLists
+  /// Remove from the ObjectLists
   ClassList::iterator it;
   for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
@@ -89,5 +89,5 @@
  * @return True if found, false if not.
  */
-bool BaseObject::isA(const NewObjectListBase& objectList) const
+bool BaseObject::isA(const ObjectListBase& objectList) const
 {
   ClassList::const_iterator it;
@@ -104,5 +104,5 @@
  * @return True if found, false if not.
  */
-bool BaseObject::isA(const NewClassID& classID) const
+bool BaseObject::isA(const ClassID& classID) const
 {
   ClassList::const_iterator it;
Index: branches/new_class_id/src/lib/lang/base_object.h
===================================================================
--- branches/new_class_id/src/lib/lang/base_object.h	(revision 9714)
+++ branches/new_class_id/src/lib/lang/base_object.h	(revision 9715)
@@ -26,5 +26,5 @@
 class BaseObject : public sigslot::has_slots<>
 {
-  NewObjectListDeclaration(BaseObject);
+  ObjectListDeclaration(BaseObject);
 public:
   BaseObject (const std::string& objectName = "");
@@ -48,10 +48,10 @@
   inline const std::string& getClassName() const { return _classes.front()._objectList->name(); };
 
-  inline const NewClassID& getClassID() const { return *_leafClassID; }
+  inline const ClassID& getClassID() const { return *_leafClassID; }
   /** @returns the ID of the Topmost object of the ClassStack */
   inline const int& getLeafClassID() const { return _leafClassID->id(); }
 
-  bool isA(const NewObjectListBase& objectList) const;
-  bool isA(const NewClassID& classID) const;
+  bool isA(const ObjectListBase& objectList) const;
+  bool isA(const ClassID& classID) const;
   bool isA(int classID) const;
   bool isA(const std::string& className) const;
@@ -65,5 +65,5 @@
 
 protected:
-  template<class T> void registerObject(T* object, NewObjectList<T>& list);
+  template<class T> void registerObject(T* object, ObjectList<T>& list);
 
 protected:
@@ -80,8 +80,8 @@
   struct ClassEntry
   {
-    /** Simple Constuctor @param objectList the NewObjectList, @param iterator the (intrusive) Iterator inside of the ObjectList */
-    inline ClassEntry (NewObjectListBase* objectList, NewObjectListBase::IteratorBase* iterator) : _objectList(objectList), _iterator(iterator) {}
-    NewObjectListBase*                _objectList;  //!< A ObjectList this Object is part of
-    NewObjectListBase::IteratorBase*  _iterator;    //!< An iterator pointing to the position of the Object inside of the List.
+    /** Simple Constuctor @param objectList the ObjectList, @param iterator the (intrusive) Iterator inside of the ObjectList */
+    inline ClassEntry (ObjectListBase* objectList, ObjectListBase::IteratorBase* iterator) : _objectList(objectList), _iterator(iterator) {}
+    ObjectListBase*                _objectList;  //!< A ObjectList this Object is part of
+    ObjectListBase::IteratorBase*  _iterator;    //!< An iterator pointing to the position of the Object inside of the List.
   };
   typedef std::list<ClassEntry>        ClassList;   //!< Type definition for the List.
@@ -89,5 +89,5 @@
   std::string                         className;    //!< the name of the class
   ClassList                           _classes;     //!< All Classes this object is part of.
-  const NewClassID*                       _leafClassID;  //!< Topmost ClassID.
+  const ClassID*                       _leafClassID;  //!< Topmost ClassID.
 };
 
@@ -103,5 +103,5 @@
  */
 template<class T>
-inline void BaseObject::registerObject(T* object, NewObjectList<T>& objectList)
+inline void BaseObject::registerObject(T* object, ObjectList<T>& objectList)
 {
   this->_leafClassID = &objectList.identity();
Index: branches/new_class_id/src/lib/lang/new_class_id.cc
===================================================================
--- branches/new_class_id/src/lib/lang/new_class_id.cc	(revision 9714)
+++ branches/new_class_id/src/lib/lang/new_class_id.cc	(revision 9715)
@@ -23,5 +23,5 @@
  * this Always points to the ID of the NullClass.
  */
-NewClassID::NewClassID()
+ClassID::ClassID()
 {
   NullClass::acquireID(this->_id, this->_name);
@@ -30,7 +30,7 @@
 /**
  * @brief Acquiring the ID of a objectList.
- * @param objList The NewObjectList to acquire the ID from.
+ * @param objList The ObjectList to acquire the ID from.
  */
-NewClassID::NewClassID(const NewObjectListBase* const objList)
+ClassID::ClassID(const ObjectListBase* const objList)
 {
   objList->acquireID(this->_id, this->_name);
@@ -38,5 +38,5 @@
 
 
-NewClassID NullClass::_classID;
+ClassID NullClass::_classID;
 
 int NullClass::_nullID;
Index: branches/new_class_id/src/lib/lang/new_class_id.h
===================================================================
--- branches/new_class_id/src/lib/lang/new_class_id.h	(revision 9714)
+++ branches/new_class_id/src/lib/lang/new_class_id.h	(revision 9715)
@@ -10,22 +10,22 @@
 #include <string>
 
-class NewObjectListBase;
+class ObjectListBase;
 
 //! A class to dynamically allocate ClassID's and to support a isA operator
 /**
- * A NewClassID can only be aquired over a NewObjectList,
+ * A ClassID can only be aquired over a ObjectList,
  * thus enabling the developer to have permanent access to the correct ID and ClassName
  *
- * The Idea behind this concept is, that storing a NewClassID that changes its internal state
- * all NewClassID's will be updated correctly.
+ * The Idea behind this concept is, that storing a ClassID that changes its internal state
+ * all ClassID's will be updated correctly.
  *
- * Since the Existance of any NewObjectList is a requirement during the working process all
+ * Since the Existance of any ObjectList is a requirement during the working process all
  * ID's should reference a valid ID and ClassName
  */
-class NewClassID
+class ClassID
 {
 public:
-  NewClassID();
-  NewClassID(const NewObjectListBase* const id);
+  ClassID();
+  ClassID(const ObjectListBase* const id);
   /// the copy constructor is also defined implicitely.
 
@@ -36,5 +36,5 @@
 
   /** @param id the id to compare @returns true on match (match is same ID) @brief compares two id's */
-  bool operator==(const NewClassID& id) const { return *_id == *id._id /* || _name == id._name */; };
+  bool operator==(const ClassID& id) const { return *_id == *id._id /* || _name == id._name */; };
   /** @param id the id to compare @returns true on match (match is same ID) @brief compares two id's */
   bool operator==(int id) const { return *_id == id; };
@@ -42,5 +42,5 @@
   bool operator==(const std::string& name) const { return *_name == name; };
   /** @param id the id to compare @returns false on match (match is same ID) @brief compares two id's */
-  bool operator!=(const NewClassID& id) const { return *_id != *id._id /* && _name != id._name*/;  };
+  bool operator!=(const ClassID& id) const { return *_id != *id._id /* && _name != id._name*/;  };
   /** @param id the id to compare @returns false on match (match is same ID) @brief compares two id's */
   bool operator!=(int id) const { return *_id != id; };
@@ -61,5 +61,5 @@
 public:
   /** @returns the NullClass' ID. */
-  static const NewClassID& classID() { return NullClass::_classID; }
+  static const ClassID& classID() { return NullClass::_classID; }
   /** @param id the ID to acquire @param name the name to acquire @brief acquires the ID of this Class */
   static void acquireID(const int*& id, const std::string*& name) { id = &_nullID; name = &_nullName; };
@@ -69,5 +69,5 @@
 
 private:
-  static NewClassID         _classID;      //!< The NullClass' ID
+  static ClassID         _classID;      //!< The NullClass' ID
   static const std::string  _nullName;     //!< The NullClass' Name ("NullClass")
   static int                _nullID;       //!< The NullClass' ID
Index: branches/new_class_id/src/lib/lang/new_object_list.cc
===================================================================
--- branches/new_class_id/src/lib/lang/new_object_list.cc	(revision 9714)
+++ branches/new_class_id/src/lib/lang/new_object_list.cc	(revision 9715)
@@ -28,23 +28,23 @@
  * @return a new NewObejctList
  */
-NewObjectListBase::NewObjectListBase(const std::string& className, int id)
+ObjectListBase::ObjectListBase(const std::string& className, int id)
     : _name(className)
 {
-  printf("NewObjectList, Registered %s::%d\n", className.c_str(), id);
-  if (NewObjectListBase::_classesByID == NULL)
-  {
-    NewObjectListBase::_classesByID = new classIDMap;
-    assert (NewObjectListBase::_classesByName == NULL);
-    NewObjectListBase::_classesByName = new classNameMap;
-  }
-  assert(!NewObjectListBase::classNameExists(className) && "Classes should only be included once, and no two classes should have the same name (key value)");
+  printf("ObjectList, Registered %s::%d\n", className.c_str(), id);
+  if (ObjectListBase::_classesByID == NULL)
+  {
+    ObjectListBase::_classesByID = new classIDMap;
+    assert (ObjectListBase::_classesByName == NULL);
+    ObjectListBase::_classesByName = new classNameMap;
+  }
+  assert(!ObjectListBase::classNameExists(className) && "Classes should only be included once, and no two classes should have the same name (key value)");
 
   if (id == -1)
   {
-    id = NewObjectListBase::_classesByID->size();
+    id = ObjectListBase::_classesByID->size();
     // searching for a free ID
-    while (NewObjectListBase::classIDExists(id)) ++id;
-  }
-  assert(!NewObjectListBase::classIDExists(id) && "Classes should only be included once, and no two classes should have the same ID (key value)");
+    while (ObjectListBase::classIDExists(id)) ++id;
+  }
+  assert(!ObjectListBase::classIDExists(id) && "Classes should only be included once, and no two classes should have the same ID (key value)");
 
   _id = id;
@@ -52,7 +52,7 @@
   std::cout << "register new ObjectList " << className << " ID: " << this->_id << std::endl;
 
-  this->_identity = NewClassID(this);
-  (*NewObjectListBase::_classesByID)[this->_identity.id()] = this;
-  (*NewObjectListBase::_classesByName)[this->_identity.name()] = this;
+  this->_identity = ClassID(this);
+  (*ObjectListBase::_classesByID)[this->_identity.id()] = this;
+  (*ObjectListBase::_classesByName)[this->_identity.name()] = this;
 }
 
@@ -61,37 +61,37 @@
  * Destructor.
  *
- * This destructor deletes the NewObjectList, and cleans up the NewObjectList sorted Maps.
- */
-NewObjectListBase::~NewObjectListBase()
-{
-  assert (NewObjectListBase::_classesByName != NULL && NewObjectListBase::_classesByID != NULL);
+ * This destructor deletes the ObjectList, and cleans up the ObjectList sorted Maps.
+ */
+ObjectListBase::~ObjectListBase()
+{
+  assert (ObjectListBase::_classesByName != NULL && ObjectListBase::_classesByID != NULL);
   /*
   std::cout << "Erasing: " << this->_name << " "<< this->_id  << std::endl;
-  std::cout << "SIZE OF _classByID: " << NewObjectListBase::_classesByID->size() << std::endl;
-  std::cout << "SIZE OF _classByName: " << NewObjectListBase::_classesByName->size() << std::endl;
+  std::cout << "SIZE OF _classByID: " << ObjectListBase::_classesByID->size() << std::endl;
+  std::cout << "SIZE OF _classByName: " << ObjectListBase::_classesByName->size() << std::endl;
   */
-  NewObjectListBase::_classesByID->erase(this->_identity.id());
-  NewObjectListBase::_classesByName->erase(this->_identity.name());
-
-  if (NewObjectListBase::_classesByID->empty())
-  {
-    delete NewObjectListBase::_classesByID;
-    NewObjectListBase::_classesByID = NULL;
-    assert(NewObjectListBase::_classesByName != NULL);
-    delete NewObjectListBase::_classesByName;
-    NewObjectListBase::_classesByName = NULL;
-  }
-}
-
-NewObjectListBase::classIDMap* NewObjectListBase::_classesByID = NULL;
-NewObjectListBase::classNameMap* NewObjectListBase::_classesByName = NULL;
+  ObjectListBase::_classesByID->erase(this->_identity.id());
+  ObjectListBase::_classesByName->erase(this->_identity.name());
+
+  if (ObjectListBase::_classesByID->empty())
+  {
+    delete ObjectListBase::_classesByID;
+    ObjectListBase::_classesByID = NULL;
+    assert(ObjectListBase::_classesByName != NULL);
+    delete ObjectListBase::_classesByName;
+    ObjectListBase::_classesByName = NULL;
+  }
+}
+
+ObjectListBase::classIDMap* ObjectListBase::_classesByID = NULL;
+ObjectListBase::classNameMap* ObjectListBase::_classesByName = NULL;
 
 /**
  * @returns the Registered Class Count.
  */
-unsigned int NewObjectListBase::classCount()
-{
-  assert (NewObjectListBase::_classesByID != NULL);
-  return NewObjectListBase::_classesByID->size();
+unsigned int ObjectListBase::classCount()
+{
+  assert (ObjectListBase::_classesByID != NULL);
+  return ObjectListBase::_classesByID->size();
 };
 
@@ -101,7 +101,7 @@
  * @return true if such a class already exists.
  */
-bool NewObjectListBase::classIDExists(int id)
-{
-  return (NewObjectListBase::_classesByID->find(id) != NewObjectListBase::_classesByID->end());
+bool ObjectListBase::classIDExists(int id)
+{
+  return (ObjectListBase::_classesByID->find(id) != ObjectListBase::_classesByID->end());
 }
 
@@ -111,17 +111,17 @@
  * @return true if such a class already exists.
  */
-bool NewObjectListBase::classNameExists(const std::string& name)
-{
-  return (NewObjectListBase::_classesByName->find(name) != NewObjectListBase::_classesByName->end());
-}
-
-/**
- * @brief searches for a NewClassID in the list of all NewObjectLists, and returns its Identity
+bool ObjectListBase::classNameExists(const std::string& name)
+{
+  return (ObjectListBase::_classesByName->find(name) != ObjectListBase::_classesByName->end());
+}
+
+/**
+ * @brief searches for a ClassID in the list of all ObjectLists, and returns its Identity
  * @param id: The Id to search for
  * @returns the ClassID if found and NullClass' identity if not.
  */
-const NewClassID& NewObjectListBase::retrieveIdentity(int id)
-{
-  const NewObjectListBase* const base = NewObjectListBase::getObjectList(id);
+const ClassID& ObjectListBase::retrieveIdentity(int id)
+{
+  const ObjectListBase* const base = ObjectListBase::getObjectList(id);
 
   if (base != NULL)
@@ -133,11 +133,11 @@
 
 /**
- * @brief searches for a NewClassID in the list of all NewObjectLists, and returns its Identity
+ * @brief searches for a ClassID in the list of all ObjectLists, and returns its Identity
  * @param name: The Name to search for
  * @returns the ClassID if found and NullClass' identity if not.
  */
-const NewClassID& NewObjectListBase::retrieveIdentity(const std::string& name)
-{
-  const NewObjectListBase* const base = NewObjectListBase::getObjectList(name);
+const ClassID& ObjectListBase::retrieveIdentity(const std::string& name)
+{
+  const ObjectListBase* const base = ObjectListBase::getObjectList(name);
 
   if (base != NULL)
@@ -151,11 +151,11 @@
  * @brief Searches for a ObjectList with the ID classID
  * @param classID the ID to search for.
- * @return The NewObjectList if found, NULL otherwise.
- */
-const NewObjectListBase* const NewObjectListBase::getObjectList(int classID)
-{
-  assert (NewObjectListBase::_classesByID != NULL);
-  NewObjectListBase::classIDMap::iterator it = NewObjectListBase::_classesByID->find(classID);
-  if (it != NewObjectListBase::_classesByID->end())
+ * @return The ObjectList if found, NULL otherwise.
+ */
+const ObjectListBase* const ObjectListBase::getObjectList(int classID)
+{
+  assert (ObjectListBase::_classesByID != NULL);
+  ObjectListBase::classIDMap::iterator it = ObjectListBase::_classesByID->find(classID);
+  if (it != ObjectListBase::_classesByID->end())
     return (*it).second;
   else
@@ -166,11 +166,11 @@
  * @brief Searches for a ObjectList with the Name className
  * @param className the Name to search for.
- * @return The NewObjectList if found, NULL otherwise.
- */
-const NewObjectListBase* const NewObjectListBase::getObjectList(const std::string& className)
-{
-  assert (NewObjectListBase::_classesByName != NULL);
-  NewObjectListBase::classNameMap::iterator it = NewObjectListBase::_classesByName->find(className);
-  if (it != NewObjectListBase::_classesByName->end())
+ * @return The ObjectList if found, NULL otherwise.
+ */
+const ObjectListBase* const ObjectListBase::getObjectList(const std::string& className)
+{
+  assert (ObjectListBase::_classesByName != NULL);
+  ObjectListBase::classNameMap::iterator it = ObjectListBase::_classesByName->find(className);
+  if (it != ObjectListBase::_classesByName->end())
     return (*it).second;
   else
@@ -179,11 +179,11 @@
 
 /**
- * @brief Searches for a ObjectList with the NewClassID classID
+ * @brief Searches for a ObjectList with the ClassID classID
  * @param classID the ID to search for.
- * @return The NewObjectList if found, NULL otherwise.
- */
-const NewObjectListBase* const NewObjectListBase::getObjectList(const NewClassID& classID)
-{
-  return NewObjectListBase::getObjectList(classID.id());
+ * @return The ObjectList if found, NULL otherwise.
+ */
+const ObjectListBase* const ObjectListBase::getObjectList(const ClassID& classID)
+{
+  return ObjectListBase::getObjectList(classID.id());
 }
 
@@ -193,7 +193,7 @@
  * @param objectName the Name of the Object to search for
  */
-BaseObject* NewObjectListBase::getBaseObject(int classID, const std::string& objectName)
-{
-  const NewObjectListBase* const base = NewObjectListBase::getObjectList(classID);
+BaseObject* ObjectListBase::getBaseObject(int classID, const std::string& objectName)
+{
+  const ObjectListBase* const base = ObjectListBase::getObjectList(classID);
 
   if (base != NULL)
@@ -208,7 +208,7 @@
  * @param objectName the Name of the Object to search for
  */
-BaseObject* NewObjectListBase::getBaseObject(const std::string& className, const std::string& objectName)
-{
-  const NewObjectListBase* const base = NewObjectListBase::getObjectList(className);
+BaseObject* ObjectListBase::getBaseObject(const std::string& className, const std::string& objectName)
+{
+  const ObjectListBase* const base = ObjectListBase::getObjectList(className);
 
   if (base != NULL)
@@ -220,10 +220,10 @@
 /**
  * @brief Retrieves the first BaseObject matching the name objectName from the List matching classID.
- * @param classID The NewClassID of the List.
+ * @param classID The ClassID of the List.
  * @param objectName the Name of the Object to search for
  */
-BaseObject* NewObjectListBase::getBaseObject(const NewClassID& classID, const std::string& objectName)
-{
-  const NewObjectListBase* const base = NewObjectListBase::getObjectList(classID);
+BaseObject* ObjectListBase::getBaseObject(const ClassID& classID, const std::string& objectName)
+{
+  const ObjectListBase* const base = ObjectListBase::getObjectList(classID);
 
   if (base != NULL)
@@ -238,5 +238,5 @@
  * @brief Prints out some debugging information about a given List.
  */
-void NewObjectListBase::debug(unsigned int level) const
+void ObjectListBase::debug(unsigned int level) const
 {
   base_list list;
@@ -259,10 +259,10 @@
 
 
-void NewObjectListBase::debugAll(unsigned int level)
-{
-  printf("Listing all %d ObjectLists \n", NewObjectListBase::_classesByID->size());
-
-  for (classNameMap::const_iterator it = NewObjectListBase::_classesByName->begin();
-       it != NewObjectListBase::_classesByName->end();
+void ObjectListBase::debugAll(unsigned int level)
+{
+  printf("Listing all %d ObjectLists \n", ObjectListBase::_classesByID->size());
+
+  for (classNameMap::const_iterator it = ObjectListBase::_classesByName->begin();
+       it != ObjectListBase::_classesByName->end();
        ++it)
   {
@@ -280,7 +280,7 @@
  * @return The ClassName or an empty string if the ID was not found.
  */
-const std::string& NewObjectListBase::IDToString(int classID)
-{
-  const NewObjectListBase* const base = NewObjectListBase::getObjectList(classID);
+const std::string& ObjectListBase::IDToString(int classID)
+{
+  const ObjectListBase* const base = ObjectListBase::getObjectList(classID);
 
   if (base != NULL)
@@ -299,7 +299,7 @@
  * @return The Classes ID if found, -1 otherwise.
  */
-int NewObjectListBase::StringToID(const std::string& className)
-{
-  const NewObjectListBase* const base = NewObjectListBase::getObjectList(className);
+int ObjectListBase::StringToID(const std::string& className)
+{
+  const ObjectListBase* const base = ObjectListBase::getObjectList(className);
 
   if (base != NULL)
Index: branches/new_class_id/src/lib/lang/new_object_list.h
===================================================================
--- branches/new_class_id/src/lib/lang/new_object_list.h	(revision 9714)
+++ branches/new_class_id/src/lib/lang/new_object_list.h	(revision 9715)
@@ -21,24 +21,24 @@
  * two new functions objectList() and classID().
  */
-#define NewObjectListDeclaration(ClassName) \
+#define ObjectListDeclaration(ClassName) \
   public: \
-   static inline const NewObjectList<ClassName>& objectList() { return ClassName::_objectList; }; \
-   static inline const NewClassID& classID() { return ClassName::_objectList.identity(); }; \
+   static inline const ObjectList<ClassName>& objectList() { return ClassName::_objectList; }; \
+   static inline const ClassID& classID() { return ClassName::_objectList.identity(); }; \
   private: \
-   static NewObjectList<ClassName> _objectList
-
-#define NewObjectListDefinitionID(ClassName, ID) \
-   NewObjectList<ClassName> ClassName::_objectList(#ClassName, ID)
-
-
-#define NewObjectListDefinition(ClassName) \
-    NewObjectListDefinitionID(ClassName, -1)
+   static ObjectList<ClassName> _objectList
+
+#define ObjectListDefinitionID(ClassName, ID) \
+   ObjectList<ClassName> ClassName::_objectList(#ClassName, ID)
+
+
+#define ObjectListDefinition(ClassName) \
+    ObjectListDefinitionID(ClassName, -1)
 
 class BaseObject;
-//! The superclass that all NewObjectLists follow.
-/**
- * @see template<class T> NewObjectList<T>
- */
-class NewObjectListBase
+//! The superclass that all ObjectLists follow.
+/**
+ * @see template<class T> ObjectList<T>
+ */
+class ObjectListBase
 {
 public:
@@ -56,5 +56,5 @@
 public:
   /** @returns The Identity of the Class stored within. */
-  inline const NewClassID&              identity() const { return _identity; }
+  inline const ClassID&              identity() const { return _identity; }
   /** @returns the ID of the Identity of the ObjectList */
   inline int                            id() const { return _id; };
@@ -64,5 +64,5 @@
   inline bool                           operator==(int id) const { return _id == id; };
   /** @param id The id to compare @returns true on match, false otherwise */
-  inline bool                           operator==(const NewClassID& id) const { return id == _id; };
+  inline bool                           operator==(const ClassID& id) const { return id == _id; };
   /** @param name The name to compare @returns true on match, false otherwise */
   inline bool                           operator==(const std::string& name) const { return _name == name; };
@@ -72,14 +72,14 @@
   virtual void                          getBaseObjectList(base_list* list) const = 0;
 
-  static const NewClassID&              retrieveIdentity(int id);
-  static const NewClassID&              retrieveIdentity(const std::string& name);
-
-  static const NewObjectListBase* const getObjectList(int classID);
-  static const NewObjectListBase* const getObjectList(const std::string& className);
-  static const NewObjectListBase* const getObjectList(const NewClassID& classID);
+  static const ClassID&              retrieveIdentity(int id);
+  static const ClassID&              retrieveIdentity(const std::string& name);
+
+  static const ObjectListBase* const getObjectList(int classID);
+  static const ObjectListBase* const getObjectList(const std::string& className);
+  static const ObjectListBase* const getObjectList(const ClassID& classID);
 
   static BaseObject*                    getBaseObject(int classID, const std::string& objectName);
   static BaseObject*                    getBaseObject(const std::string& className, const std::string& objectName);
-  static BaseObject*                    getBaseObject(const NewClassID& classID, const std::string& objectName);
+  static BaseObject*                    getBaseObject(const ClassID& classID, const std::string& objectName);
 
   /** @returns an Object with Name name out of this List @param name the name of the Object. */
@@ -100,9 +100,9 @@
 
 protected:
-  NewObjectListBase(const std::string& className, int id = -1);
-  virtual ~NewObjectListBase();
-
-private:
-  NewObjectListBase(const NewObjectListBase&);
+  ObjectListBase(const std::string& className, int id = -1);
+  virtual ~ObjectListBase();
+
+private:
+  ObjectListBase(const ObjectListBase&);
 
   static bool                         classIDExists(int id);
@@ -111,11 +111,11 @@
 
 protected:
-  typedef std::map<int, NewObjectListBase*>         classIDMap;   //!< The Generic Map.
-  typedef std::map<std::string, NewObjectListBase*> classNameMap; //!< The Generic Map.
+  typedef std::map<int, ObjectListBase*>         classIDMap;   //!< The Generic Map.
+  typedef std::map<std::string, ObjectListBase*> classNameMap; //!< The Generic Map.
 
 private:
   int                           _id;
   const std::string             _name;              //!< The Name of the Class.
-  NewClassID                    _identity;          //!< The Identity of the Class. (equal to _id and _name)
+  ClassID                    _identity;          //!< The Identity of the Class. (equal to _id and _name)
 
 private:
@@ -135,5 +135,5 @@
  *  as with normal std::list.
  *
- * Furthermore the linkage over the single Lists is given over the Superclass NewObjectListBase.
+ * Furthermore the linkage over the single Lists is given over the Superclass ObjectListBase.
  *
  *
@@ -141,6 +141,6 @@
  *
  * To define a Class with a ObjectList, you have to:
- *  1. Include 'NewObjectListDeclaration(T);' in its Declaration (at the beginning)
- *  2. Include 'NewObjectListDefinition(T);' in some Definition file (cc-file)
+ *  1. Include 'ObjectListDeclaration(T);' in its Declaration (at the beginning)
+ *  2. Include 'ObjectListDefinition(T);' in some Definition file (cc-file)
  *  3. In the constructor add 'registerObject(this, objectList);'
  *
@@ -154,5 +154,5 @@
  *
  * @example Iterating: Iteration is made easy, and fast as follows:
- *   for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+ *   for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
  *      it != PlayerStats::objectList().end();
  *     ++it)
@@ -166,5 +166,5 @@
  */
 template<class T>
-class NewObjectList : public NewObjectListBase
+class ObjectList : public ObjectListBase
 {
 public:
@@ -174,15 +174,15 @@
 
 
-class Iterator : public NewObjectListBase::IteratorBase
+class Iterator : public ObjectListBase::IteratorBase
   {
   public:
     Iterator(iterator it) { _it = it; }
     inline iterator& it() { return _it; }
-    typename NewObjectList::iterator _it;
+    typename ObjectList::iterator _it;
   };
 
 public:
-  NewObjectList(const std::string& name, int id = -1);
-  ~NewObjectList();
+  ObjectList(const std::string& name, int id = -1);
+  ~ObjectList();
 
   virtual BaseObject*                getBaseObject(const std::string& name) const;
@@ -210,14 +210,14 @@
 
 
-  NewObjectListBase::IteratorBase*   registerObject(T* object);
+  ObjectListBase::IteratorBase*   registerObject(T* object);
   virtual void                       unregisterObject(IteratorBase* iterator);
 
 protected:
-  virtual void                       getBaseObjectList(NewObjectListBase::base_list* list) const;
+  virtual void                       getBaseObjectList(ObjectListBase::base_list* list) const;
 
 
 private:
   //! the copy constructor will be hidden.
-  NewObjectList(const NewObjectList& definer) {};
+  ObjectList(const ObjectList& definer) {};
 
 private:
@@ -233,18 +233,18 @@
 /////////////////////////
 /**
- * @brief creates a new NewObjectList
+ * @brief creates a new ObjectList
  * @param name The name of the Class.
  * @param id The ID of the class if desired, or -1 if an id should be assigned automatically.
  */
 template <class T>
-NewObjectList<T>::NewObjectList(const std::string& name, int id)
-    : NewObjectListBase(name, id)
+ObjectList<T>::ObjectList(const std::string& name, int id)
+    : ObjectListBase(name, id)
 {}
 
 /**
- * @brief deletes the NewObjectList.
- */
-template <class T>
-NewObjectList<T>::~NewObjectList()
+ * @brief deletes the ObjectList.
+ */
+template <class T>
+ObjectList<T>::~ObjectList()
 {
   if (!_objects.empty())
@@ -260,5 +260,5 @@
  */
 template <class T>
-BaseObject* NewObjectList<T>::getBaseObject(const std::string& name) const
+BaseObject* ObjectList<T>::getBaseObject(const std::string& name) const
 {
   return this->getObject(name);
@@ -273,5 +273,5 @@
  */
 template <class T>
-T* NewObjectList<T>::getObject(const std::string& name) const
+T* ObjectList<T>::getObject(const std::string& name) const
 {
   const_iterator it;
@@ -288,5 +288,5 @@
  */
 template <class T>
-    bool NewObjectList<T>::exists(const T* const object) const
+    bool ObjectList<T>::exists(const T* const object) const
 {
   return (std::find(_objects.begin(), _objects.end(), object) != _objects.end());
@@ -299,5 +299,5 @@
  */
 template <class T>
-void NewObjectList<T>::getBaseObjectList(NewObjectListBase::base_list* list) const
+void ObjectList<T>::getBaseObjectList(ObjectListBase::base_list* list) const
 {
   assert (list != NULL);
@@ -309,10 +309,10 @@
 
 /**
- * @brief registers an Object to the NewObjectList.
+ * @brief registers an Object to the ObjectList.
  * @param T object the Object to register.
  * @returns a pointer to the iterator inside of the list.
  */
 template <class T>
-NewObjectListBase::IteratorBase* NewObjectList<T>::registerObject(T* object)
+ObjectListBase::IteratorBase* ObjectList<T>::registerObject(T* object)
 {
   this->_objects.push_back(object);
@@ -325,5 +325,5 @@
  */
 template <class T>
-void NewObjectList<T>::unregisterObject(IteratorBase* iterator)
+void ObjectList<T>::unregisterObject(IteratorBase* iterator)
 {
   this->_objects.erase(static_cast<Iterator*>(iterator)->it());
Index: branches/new_class_id/src/lib/lang/test_object_list.cc
===================================================================
--- branches/new_class_id/src/lib/lang/test_object_list.cc	(revision 9714)
+++ branches/new_class_id/src/lib/lang/test_object_list.cc	(revision 9715)
@@ -12,5 +12,5 @@
   //   bool operator==(const std::string& name) const { return _objectName == name; };
 
-    NewObjectListDeclaration(NewBaseObject);
+    ObjectListDeclaration(NewBaseObject);
 
 protected:
@@ -20,12 +20,12 @@
   };
   template<class T>
-  inline void registerObject(T* object, NewObjectList<T>& objectList) { _id.registerObject(object, objectList); };
+  inline void registerObject(T* object, ObjectList<T>& objectList) { _id.registerObject(object, objectList); };
 protected:
-  NewClassID    _id;
+  ClassID    _id;
   std::string   _objectName;
 
 
 };
-NewObjectListDefinition(NewBaseObject);
+ObjectListDefinition(NewBaseObject);
 
 
@@ -40,8 +40,8 @@
 
 
-  NewObjectListDeclaration(Test);
+  ObjectListDeclaration(Test);
   //ObjectListDeclaration(Test);
 };
-NewObjectListDefinitionID(Test, -1);
+ObjectListDefinitionID(Test, -1);
 
 Test::Test()
@@ -73,7 +73,7 @@
     //  std::cout << "~Bone()\n";
   };
-  NewObjectListDeclaration(Bone);
+  ObjectListDeclaration(Bone);
 };
-NewObjectListDefinitionID(Bone, -1);
+ObjectListDefinitionID(Bone, -1);
 
 int main()
Index: branches/new_class_id/src/lib/network/converter.cc
===================================================================
--- branches/new_class_id/src/lib/network/converter.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/converter.cc	(revision 9715)
@@ -28,5 +28,5 @@
 SHELL_COMMAND_STATIC(debug, Converter, Converter::debug);
 
-NewObjectListDefinition(Converter);
+ObjectListDefinition(Converter);
 /* using namespace std is default, this needs to be here */
 
Index: branches/new_class_id/src/lib/network/converter.h
===================================================================
--- branches/new_class_id/src/lib/network/converter.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/converter.h	(revision 9715)
@@ -24,5 +24,5 @@
 class Converter : public BaseObject
 {
-  NewObjectListDeclaration(Converter);
+  ObjectListDeclaration(Converter);
   public:
     static byte* intToByteArray(int x);
Index: branches/new_class_id/src/lib/network/data_stream.cc
===================================================================
--- branches/new_class_id/src/lib/network/data_stream.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/data_stream.cc	(revision 9715)
@@ -20,5 +20,5 @@
 /* using namespace std is default, this needs to be here */
 
-NewObjectListDefinition(DataStream);
+ObjectListDefinition(DataStream);
 
 /**
Index: branches/new_class_id/src/lib/network/data_stream.h
===================================================================
--- branches/new_class_id/src/lib/network/data_stream.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/data_stream.h	(revision 9715)
@@ -17,5 +17,5 @@
 class DataStream : public BaseObject
 {
-  NewObjectListDeclaration(DataStream);
+  ObjectListDeclaration(DataStream);
   public:
       DataStream();
Index: branches/new_class_id/src/lib/network/handshake.cc
===================================================================
--- branches/new_class_id/src/lib/network/handshake.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/handshake.cc	(revision 9715)
@@ -23,5 +23,5 @@
 
 
-NewObjectListDefinition(Handshake);
+ObjectListDefinition(Handshake);
 
 
Index: branches/new_class_id/src/lib/network/handshake.h
===================================================================
--- branches/new_class_id/src/lib/network/handshake.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/handshake.h	(revision 9715)
@@ -42,5 +42,5 @@
 class Handshake : public Synchronizeable
 {
-  NewObjectListDeclaration(Handshake);
+  ObjectListDeclaration(Handshake);
   public:
     Handshake( int nodeType, int clientId = 0, int networkGameManagerId = 0, int messageManagerId = 0 );
Index: branches/new_class_id/src/lib/network/message_manager.cc
===================================================================
--- branches/new_class_id/src/lib/network/message_manager.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/message_manager.cc	(revision 9715)
@@ -28,5 +28,5 @@
 
 
-NewObjectListDefinition(MessageManager);
+ObjectListDefinition(MessageManager);
 MessageManager* MessageManager::singletonRef = NULL;
 
Index: branches/new_class_id/src/lib/network/message_manager.h
===================================================================
--- branches/new_class_id/src/lib/network/message_manager.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/message_manager.h	(revision 9715)
@@ -96,5 +96,5 @@
 class MessageManager : public Synchronizeable {
 
-  NewObjectListDeclaration(MessageManager);
+  ObjectListDeclaration(MessageManager);
  public:
    inline static MessageManager * getInstance(){ if (!singletonRef) singletonRef = new MessageManager();  return singletonRef; }
Index: branches/new_class_id/src/lib/network/monitor/connection_monitor.cc
===================================================================
--- branches/new_class_id/src/lib/network/monitor/connection_monitor.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/monitor/connection_monitor.cc	(revision 9715)
@@ -23,5 +23,5 @@
 /* using namespace std is default, this needs to be here */
 
-NewObjectListDefinition(ConnectionMonitor);
+ObjectListDefinition(ConnectionMonitor);
 /**
  * constructor
Index: branches/new_class_id/src/lib/network/monitor/connection_monitor.h
===================================================================
--- branches/new_class_id/src/lib/network/monitor/connection_monitor.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/monitor/connection_monitor.h	(revision 9715)
@@ -19,5 +19,5 @@
 class ConnectionMonitor : virtual public BaseObject
 {
-  NewObjectListDeclaration(ConnectionMonitor);
+  ObjectListDeclaration(ConnectionMonitor);
   public:
     ConnectionMonitor( int userId );
Index: branches/new_class_id/src/lib/network/monitor/network_monitor.cc
===================================================================
--- branches/new_class_id/src/lib/network/monitor/network_monitor.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/monitor/network_monitor.cc	(revision 9715)
@@ -37,5 +37,5 @@
 SHELL_COMMAND(debug, NetworkMonitor, debug);
 
-NewObjectListDefinition(NetworkMonitor);
+ObjectListDefinition(NetworkMonitor);
 
 
Index: branches/new_class_id/src/lib/network/monitor/network_monitor.h
===================================================================
--- branches/new_class_id/src/lib/network/monitor/network_monitor.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/monitor/network_monitor.h	(revision 9715)
@@ -27,5 +27,5 @@
 class NetworkMonitor : public Synchronizeable
 {
-  NewObjectListDeclaration(NetworkMonitor);
+  ObjectListDeclaration(NetworkMonitor);
   public:
     NetworkMonitor(NetworkStream* networkStream);
Index: branches/new_class_id/src/lib/network/monitor/network_stats_widget.cc
===================================================================
--- branches/new_class_id/src/lib/network/monitor/network_stats_widget.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/monitor/network_stats_widget.cc	(revision 9715)
@@ -211,5 +211,5 @@
 
 
-NewObjectListDefinition(NetworkStatsWidget);
+ObjectListDefinition(NetworkStatsWidget);
 /**
  * @brief standard constructor
Index: branches/new_class_id/src/lib/network/monitor/network_stats_widget.h
===================================================================
--- branches/new_class_id/src/lib/network/monitor/network_stats_widget.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/monitor/network_stats_widget.h	(revision 9715)
@@ -81,5 +81,5 @@
 class NetworkStatsWidget : public OrxGui::GLGuiFixedpositionBox
 {
-  NewObjectListDeclaration(NetworkStatsWidget);
+  ObjectListDeclaration(NetworkStatsWidget);
   public:
     static void toggleGUI();
Index: branches/new_class_id/src/lib/network/network_game_manager.cc
===================================================================
--- branches/new_class_id/src/lib/network/network_game_manager.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/network_game_manager.cc	(revision 9715)
@@ -46,5 +46,5 @@
 
 
-NewObjectListDefinition(NetworkGameManager);
+ObjectListDefinition(NetworkGameManager);
 NetworkGameManager* NetworkGameManager::singletonRef = NULL;
 
@@ -97,5 +97,5 @@
 
   int          team = rules.getTeamForNewUser();
-  NewClassID   playableClassId = rules.getPlayableClassId( userId, team );
+  ClassID   playableClassId = rules.getPlayableClassId( userId, team );
   std::string  playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
   std::string  playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
@@ -186,5 +186,5 @@
   }
 
-  for (NewObjectList<Synchronizeable>::const_iterator it = Synchronizeable::objectList().begin();
+  for (ObjectList<Synchronizeable>::const_iterator it = Synchronizeable::objectList().begin();
        it != Synchronizeable::objectList().end();
       ++it)
Index: branches/new_class_id/src/lib/network/network_game_manager.h
===================================================================
--- branches/new_class_id/src/lib/network/network_game_manager.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/network_game_manager.h	(revision 9715)
@@ -33,5 +33,5 @@
 class NetworkGameManager: public Synchronizeable
 {
-  NewObjectListDeclaration(NetworkGameManager);
+  ObjectListDeclaration(NetworkGameManager);
   public:
     virtual ~NetworkGameManager();
Index: branches/new_class_id/src/lib/network/network_manager.cc
===================================================================
--- branches/new_class_id/src/lib/network/network_manager.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/network_manager.cc	(revision 9715)
@@ -40,5 +40,5 @@
 
 
-NewObjectListDefinition(NetworkManager);
+ObjectListDefinition(NetworkManager);
 NetworkManager* NetworkManager::singletonRef = NULL;
 
Index: branches/new_class_id/src/lib/network/network_manager.h
===================================================================
--- branches/new_class_id/src/lib/network/network_manager.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/network_manager.h	(revision 9715)
@@ -25,5 +25,5 @@
 class NetworkManager : public BaseObject
 {
-  NewObjectListDeclaration(NetworkManager);
+  ObjectListDeclaration(NetworkManager);
   public:
 
Index: branches/new_class_id/src/lib/network/network_protocol.cc
===================================================================
--- branches/new_class_id/src/lib/network/network_protocol.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/network_protocol.cc	(revision 9715)
@@ -35,5 +35,5 @@
 
 
-NewObjectListDefinition(NetworkProtocol);
+ObjectListDefinition(NetworkProtocol);
 /**
   standard constructor
Index: branches/new_class_id/src/lib/network/network_protocol.h
===================================================================
--- branches/new_class_id/src/lib/network/network_protocol.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/network_protocol.h	(revision 9715)
@@ -25,5 +25,5 @@
 class NetworkProtocol : virtual public BaseObject
 {
-  NewObjectListDeclaration(NetworkProtocol);
+  ObjectListDeclaration(NetworkProtocol);
   public:
     NetworkProtocol();
Index: branches/new_class_id/src/lib/network/network_socket.cc
===================================================================
--- branches/new_class_id/src/lib/network/network_socket.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/network_socket.cc	(revision 9715)
@@ -24,5 +24,5 @@
 #include "network_socket.h"
 
-NewObjectListDefinition(NetworkSocket);
+ObjectListDefinition(NetworkSocket);
 /**
  * Default constructor
Index: branches/new_class_id/src/lib/network/network_socket.h
===================================================================
--- branches/new_class_id/src/lib/network/network_socket.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/network_socket.h	(revision 9715)
@@ -17,5 +17,5 @@
 class NetworkSocket : public BaseObject
 {
-  NewObjectListDeclaration(NetworkSocket);
+  ObjectListDeclaration(NetworkSocket);
   public:
     NetworkSocket();
Index: branches/new_class_id/src/lib/network/network_stream.cc
===================================================================
--- branches/new_class_id/src/lib/network/network_stream.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/network_stream.cc	(revision 9715)
@@ -54,5 +54,5 @@
 #define PACKAGE_SIZE  256
 
-NewObjectListDefinition(NetworkStream);
+ObjectListDefinition(NetworkStream);
 /**
  * empty constructor
Index: branches/new_class_id/src/lib/network/network_stream.h
===================================================================
--- branches/new_class_id/src/lib/network/network_stream.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/network_stream.h	(revision 9715)
@@ -33,5 +33,5 @@
 class NetworkStream : public DataStream
 {
-  NewObjectListDeclaration(NetworkStream);
+  ObjectListDeclaration(NetworkStream);
   public:
     NetworkStream();
Index: branches/new_class_id/src/lib/network/player_stats.cc
===================================================================
--- branches/new_class_id/src/lib/network/player_stats.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/player_stats.cc	(revision 9715)
@@ -32,5 +32,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(PlayerStats, CL_PLAYER_STATS);
+ObjectListDefinitionID(PlayerStats, CL_PLAYER_STATS);
 CREATE_FACTORY(PlayerStats);
 
@@ -123,5 +123,5 @@
 PlayerStats * PlayerStats::getStats( int userId )
 {
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)
@@ -142,5 +142,5 @@
 {
   this->playable = NULL;
-  for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
        it != Playable::objectList().end();
        ++it)
@@ -266,5 +266,5 @@
   ScoreList result;
 
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)
Index: branches/new_class_id/src/lib/network/player_stats.h
===================================================================
--- branches/new_class_id/src/lib/network/player_stats.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/player_stats.h	(revision 9715)
@@ -36,5 +36,5 @@
 class PlayerStats : public Synchronizeable
 {
-  NewObjectListDeclaration(PlayerStats);
+  ObjectListDeclaration(PlayerStats);
   public:
     PlayerStats( const TiXmlElement* root = NULL );
@@ -58,5 +58,5 @@
 
     inline int getPlayableClassId(){ return playableClassId; }
-    void setPlayableClassId( const NewClassID& classId ){ this->playableClassId = classId.id(); };
+    void setPlayableClassId( const ClassID& classId ){ this->playableClassId = classId.id(); };
 
     inline int getPlayableUniqueId(){ return playableUniqueId; }
Index: branches/new_class_id/src/lib/network/proxy/network_settings.cc
===================================================================
--- branches/new_class_id/src/lib/network/proxy/network_settings.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/proxy/network_settings.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 
-NewObjectListDefinition(NetworkSettings);
+ObjectListDefinition(NetworkSettings);
 
 NetworkSettings* NetworkSettings::singletonRef = NULL;
Index: branches/new_class_id/src/lib/network/proxy/network_settings.h
===================================================================
--- branches/new_class_id/src/lib/network/proxy/network_settings.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/proxy/network_settings.h	(revision 9715)
@@ -24,5 +24,5 @@
 class NetworkSettings : public BaseObject
 {
-  NewObjectListDeclaration(NetworkSettings);
+  ObjectListDeclaration(NetworkSettings);
   public:
     inline static NetworkSettings* getInstance() { if (!NetworkSettings::singletonRef) NetworkSettings::singletonRef = new NetworkSettings();
Index: branches/new_class_id/src/lib/network/proxy/proxy_control.cc
===================================================================
--- branches/new_class_id/src/lib/network/proxy/proxy_control.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/proxy/proxy_control.cc	(revision 9715)
@@ -40,5 +40,5 @@
 
 SHELL_COMMAND(forceReconnect, ProxyControl, forceReconnectionShell);
-NewObjectListDefinition(ProxyControl);
+ObjectListDefinition(ProxyControl);
 
 /**
Index: branches/new_class_id/src/lib/network/proxy/proxy_control.h
===================================================================
--- branches/new_class_id/src/lib/network/proxy/proxy_control.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/proxy/proxy_control.h	(revision 9715)
@@ -30,5 +30,5 @@
 class ProxyControl : public Synchronizeable
 {
-  NewObjectListDeclaration(ProxyControl);
+  ObjectListDeclaration(ProxyControl);
   public:
     inline static ProxyControl* getInstance() { if (!ProxyControl::singletonRef) ProxyControl::singletonRef = new ProxyControl();
Index: branches/new_class_id/src/lib/network/server_socket.cc
===================================================================
--- branches/new_class_id/src/lib/network/server_socket.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/server_socket.cc	(revision 9715)
@@ -23,5 +23,5 @@
 #include "server_socket.h"
 
-NewObjectListDefinition(ServerSocket);
+ObjectListDefinition(ServerSocket);
 /**
  * constructor
Index: branches/new_class_id/src/lib/network/server_socket.h
===================================================================
--- branches/new_class_id/src/lib/network/server_socket.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/server_socket.h	(revision 9715)
@@ -19,5 +19,5 @@
 class ServerSocket : public BaseObject
 {
-  NewObjectListDeclaration(ServerSocket);
+  ObjectListDeclaration(ServerSocket);
   public:
     ServerSocket( int port);
Index: branches/new_class_id/src/lib/network/shared_network_data.cc
===================================================================
--- branches/new_class_id/src/lib/network/shared_network_data.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/shared_network_data.cc	(revision 9715)
@@ -25,5 +25,5 @@
 
 
-NewObjectListDefinition(SharedNetworkData);
+ObjectListDefinition(SharedNetworkData);
 SharedNetworkData* SharedNetworkData::singletonRef = NULL;
 
Index: branches/new_class_id/src/lib/network/shared_network_data.h
===================================================================
--- branches/new_class_id/src/lib/network/shared_network_data.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/shared_network_data.h	(revision 9715)
@@ -22,5 +22,5 @@
 class SharedNetworkData : public BaseObject
 {
-  NewObjectListDeclaration(SharedNetworkData);
+  ObjectListDeclaration(SharedNetworkData);
   public:
     inline static SharedNetworkData* getInstance() { if (!SharedNetworkData::singletonRef) SharedNetworkData::singletonRef = new SharedNetworkData();
Index: branches/new_class_id/src/lib/network/synchronizeable.cc
===================================================================
--- branches/new_class_id/src/lib/network/synchronizeable.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/synchronizeable.cc	(revision 9715)
@@ -32,5 +32,5 @@
 
 
-NewObjectListDefinition(Synchronizeable);
+ObjectListDefinition(Synchronizeable);
 
 /**
Index: branches/new_class_id/src/lib/network/synchronizeable.h
===================================================================
--- branches/new_class_id/src/lib/network/synchronizeable.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/synchronizeable.h	(revision 9715)
@@ -41,5 +41,5 @@
 class Synchronizeable : virtual public BaseObject
 {
-  NewObjectListDeclaration(Synchronizeable);
+  ObjectListDeclaration(Synchronizeable);
 
   public:
Index: branches/new_class_id/src/lib/network/tcp_server_socket.cc
===================================================================
--- branches/new_class_id/src/lib/network/tcp_server_socket.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/tcp_server_socket.cc	(revision 9715)
@@ -26,5 +26,5 @@
 #include "debug.h"
 
-NewObjectListDefinition(TcpServerSocket);
+ObjectListDefinition(TcpServerSocket);
 TcpServerSocket::TcpServerSocket( int port ) : ServerSocket( port )
 {
Index: branches/new_class_id/src/lib/network/tcp_server_socket.h
===================================================================
--- branches/new_class_id/src/lib/network/tcp_server_socket.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/tcp_server_socket.h	(revision 9715)
@@ -19,5 +19,5 @@
 class TcpServerSocket : public ServerSocket
 {
-  NewObjectListDeclaration(TcpServerSocket);
+  ObjectListDeclaration(TcpServerSocket);
   public:
     TcpServerSocket( int port );
Index: branches/new_class_id/src/lib/network/tcp_socket.cc
===================================================================
--- branches/new_class_id/src/lib/network/tcp_socket.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/tcp_socket.cc	(revision 9715)
@@ -30,5 +30,5 @@
 #include "debug.h"
 
-NewObjectListDefinition(TcpSocket);
+ObjectListDefinition(TcpSocket);
 /**
  * Default constructor
Index: branches/new_class_id/src/lib/network/tcp_socket.h
===================================================================
--- branches/new_class_id/src/lib/network/tcp_socket.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/tcp_socket.h	(revision 9715)
@@ -40,5 +40,5 @@
 class TcpSocket : public NetworkSocket
 {
-  NewObjectListDeclaration(TcpSocket);
+  ObjectListDeclaration(TcpSocket);
   public:
     TcpSocket();
Index: branches/new_class_id/src/lib/network/udp_server_socket.cc
===================================================================
--- branches/new_class_id/src/lib/network/udp_server_socket.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/udp_server_socket.cc	(revision 9715)
@@ -18,5 +18,5 @@
 
 
-NewObjectListDefinition(UdpServerSocket);
+ObjectListDefinition(UdpServerSocket);
 /**
  * constructor
Index: branches/new_class_id/src/lib/network/udp_server_socket.h
===================================================================
--- branches/new_class_id/src/lib/network/udp_server_socket.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/udp_server_socket.h	(revision 9715)
@@ -50,5 +50,5 @@
 class UdpServerSocket : public ServerSocket
 {
-  NewObjectListDeclaration(UdpServerSocket);
+  ObjectListDeclaration(UdpServerSocket);
   public:
     UdpServerSocket( int port);
Index: branches/new_class_id/src/lib/network/udp_socket.cc
===================================================================
--- branches/new_class_id/src/lib/network/udp_socket.cc	(revision 9714)
+++ branches/new_class_id/src/lib/network/udp_socket.cc	(revision 9715)
@@ -18,5 +18,5 @@
 #include "debug.h"
 
-NewObjectListDefinition(UdpSocket);
+ObjectListDefinition(UdpSocket);
 
 void UdpSocket::init( )
Index: branches/new_class_id/src/lib/network/udp_socket.h
===================================================================
--- branches/new_class_id/src/lib/network/udp_socket.h	(revision 9714)
+++ branches/new_class_id/src/lib/network/udp_socket.h	(revision 9715)
@@ -24,5 +24,5 @@
 class UdpSocket : public NetworkSocket
 {
-  NewObjectListDeclaration(UdpSocket);
+  ObjectListDeclaration(UdpSocket);
   public:
     UdpSocket();
Index: branches/new_class_id/src/lib/particles/box_emitter.cc
===================================================================
--- branches/new_class_id/src/lib/particles/box_emitter.cc	(revision 9714)
+++ branches/new_class_id/src/lib/particles/box_emitter.cc	(revision 9715)
@@ -26,5 +26,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(BoxEmitter, CL_BOX_EMITTER);
+ObjectListDefinitionID(BoxEmitter, CL_BOX_EMITTER);
 CREATE_FACTORY(BoxEmitter);
 
Index: branches/new_class_id/src/lib/particles/box_emitter.h
===================================================================
--- branches/new_class_id/src/lib/particles/box_emitter.h	(revision 9714)
+++ branches/new_class_id/src/lib/particles/box_emitter.h	(revision 9715)
@@ -19,5 +19,5 @@
 class BoxEmitter : public ParticleEmitter
 {
-  NewObjectListDeclaration(BoxEmitter);
+  ObjectListDeclaration(BoxEmitter);
   friend class ParticleSystem;
 public:
Index: branches/new_class_id/src/lib/particles/dot_emitter.cc
===================================================================
--- branches/new_class_id/src/lib/particles/dot_emitter.cc	(revision 9714)
+++ branches/new_class_id/src/lib/particles/dot_emitter.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(DotEmitter, CL_DOT_EMITTER);
+ObjectListDefinitionID(DotEmitter, CL_DOT_EMITTER);
 CREATE_FACTORY(DotEmitter);
 
Index: branches/new_class_id/src/lib/particles/dot_emitter.h
===================================================================
--- branches/new_class_id/src/lib/particles/dot_emitter.h	(revision 9714)
+++ branches/new_class_id/src/lib/particles/dot_emitter.h	(revision 9715)
@@ -12,5 +12,5 @@
 class DotEmitter : public ParticleEmitter
 {
-  NewObjectListDeclaration(DotEmitter);
+  ObjectListDeclaration(DotEmitter);
 
   friend class ParticleSystem;
Index: branches/new_class_id/src/lib/particles/dot_particles.cc
===================================================================
--- branches/new_class_id/src/lib/particles/dot_particles.cc	(revision 9714)
+++ branches/new_class_id/src/lib/particles/dot_particles.cc	(revision 9715)
@@ -26,5 +26,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(DotParticles, CL_DOT_PARTICLES);
+ObjectListDefinitionID(DotParticles, CL_DOT_PARTICLES);
 CREATE_FACTORY(DotParticles);
 
Index: branches/new_class_id/src/lib/particles/dot_particles.h
===================================================================
--- branches/new_class_id/src/lib/particles/dot_particles.h	(revision 9714)
+++ branches/new_class_id/src/lib/particles/dot_particles.h	(revision 9715)
@@ -13,5 +13,5 @@
 class DotParticles : public ParticleSystem
 {
-  NewObjectListDeclaration(DotParticles);
+  ObjectListDeclaration(DotParticles);
 
 public:
Index: branches/new_class_id/src/lib/particles/model_particles.cc
===================================================================
--- branches/new_class_id/src/lib/particles/model_particles.cc	(revision 9714)
+++ branches/new_class_id/src/lib/particles/model_particles.cc	(revision 9715)
@@ -26,5 +26,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(ModelParticles, CL_MODEL_PARTICLES);
+ObjectListDefinitionID(ModelParticles, CL_MODEL_PARTICLES);
 CREATE_FACTORY(ModelParticles);
 
Index: branches/new_class_id/src/lib/particles/model_particles.h
===================================================================
--- branches/new_class_id/src/lib/particles/model_particles.h	(revision 9714)
+++ branches/new_class_id/src/lib/particles/model_particles.h	(revision 9715)
@@ -13,5 +13,5 @@
 class ModelParticles : public ParticleSystem
 {
-  NewObjectListDeclaration(ModelParticles);
+  ObjectListDeclaration(ModelParticles);
 
 public:
Index: branches/new_class_id/src/lib/particles/particle_emitter.cc
===================================================================
--- branches/new_class_id/src/lib/particles/particle_emitter.cc	(revision 9714)
+++ branches/new_class_id/src/lib/particles/particle_emitter.cc	(revision 9715)
@@ -23,5 +23,5 @@
 #include "debug.h"
 
-NewObjectListDefinition(ParticleEmitter);
+ObjectListDefinition(ParticleEmitter);
 
 /**
Index: branches/new_class_id/src/lib/particles/particle_emitter.h
===================================================================
--- branches/new_class_id/src/lib/particles/particle_emitter.h	(revision 9714)
+++ branches/new_class_id/src/lib/particles/particle_emitter.h	(revision 9715)
@@ -23,5 +23,5 @@
 class ParticleEmitter : public PNode
 {
-  NewObjectListDeclaration(ParticleEmitter);
+  ObjectListDeclaration(ParticleEmitter);
   friend class ParticleSystem;
 public:
Index: branches/new_class_id/src/lib/particles/particle_system.cc
===================================================================
--- branches/new_class_id/src/lib/particles/particle_system.cc	(revision 9714)
+++ branches/new_class_id/src/lib/particles/particle_system.cc	(revision 9715)
@@ -32,5 +32,5 @@
 #include <algorithm>
 
-NewObjectListDefinition(ParticleSystem);
+ObjectListDefinition(ParticleSystem);
 
 /**
Index: branches/new_class_id/src/lib/particles/particle_system.h
===================================================================
--- branches/new_class_id/src/lib/particles/particle_system.h	(revision 9714)
+++ branches/new_class_id/src/lib/particles/particle_system.h	(revision 9715)
@@ -56,5 +56,5 @@
 //! A class to handle ParticleSystems
 class ParticleSystem : public WorldEntity, public PhysicsInterface {
-  NewObjectListDeclaration(ParticleSystem);
+  ObjectListDeclaration(ParticleSystem);
 
  public:
Index: branches/new_class_id/src/lib/particles/plane_emitter.cc
===================================================================
--- branches/new_class_id/src/lib/particles/plane_emitter.cc	(revision 9714)
+++ branches/new_class_id/src/lib/particles/plane_emitter.cc	(revision 9715)
@@ -26,5 +26,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(PlaneEmitter, CL_PLANE_EMITTER);
+ObjectListDefinitionID(PlaneEmitter, CL_PLANE_EMITTER);
 CREATE_FACTORY(PlaneEmitter);
 
Index: branches/new_class_id/src/lib/particles/plane_emitter.h
===================================================================
--- branches/new_class_id/src/lib/particles/plane_emitter.h	(revision 9714)
+++ branches/new_class_id/src/lib/particles/plane_emitter.h	(revision 9715)
@@ -21,5 +21,5 @@
 class PlaneEmitter : public ParticleEmitter
 {
-  NewObjectListDeclaration(PlaneEmitter);
+  ObjectListDeclaration(PlaneEmitter);
 
   friend class ParticleSystem;
Index: branches/new_class_id/src/lib/particles/spark_particles.cc
===================================================================
--- branches/new_class_id/src/lib/particles/spark_particles.cc	(revision 9714)
+++ branches/new_class_id/src/lib/particles/spark_particles.cc	(revision 9715)
@@ -26,5 +26,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(SparkParticles, CL_SPARK_PARTICLES);
+ObjectListDefinitionID(SparkParticles, CL_SPARK_PARTICLES);
 CREATE_FACTORY(SparkParticles);
 
Index: branches/new_class_id/src/lib/particles/spark_particles.h
===================================================================
--- branches/new_class_id/src/lib/particles/spark_particles.h	(revision 9714)
+++ branches/new_class_id/src/lib/particles/spark_particles.h	(revision 9715)
@@ -13,5 +13,5 @@
 class SparkParticles : public ParticleSystem
 {
-  NewObjectListDeclaration(SparkParticles);
+  ObjectListDeclaration(SparkParticles);
 
 public:
Index: branches/new_class_id/src/lib/particles/sprite_particles.cc
===================================================================
--- branches/new_class_id/src/lib/particles/sprite_particles.cc	(revision 9714)
+++ branches/new_class_id/src/lib/particles/sprite_particles.cc	(revision 9715)
@@ -26,5 +26,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(SpriteParticles, CL_SPRITE_PARTICLES);
+ObjectListDefinitionID(SpriteParticles, CL_SPRITE_PARTICLES);
 CREATE_FACTORY(SpriteParticles);
 
Index: branches/new_class_id/src/lib/particles/sprite_particles.h
===================================================================
--- branches/new_class_id/src/lib/particles/sprite_particles.h	(revision 9714)
+++ branches/new_class_id/src/lib/particles/sprite_particles.h	(revision 9715)
@@ -13,5 +13,5 @@
 class SpriteParticles : public ParticleSystem
 {
-  NewObjectListDeclaration(SpriteParticles);
+  ObjectListDeclaration(SpriteParticles);
 
 public:
Index: branches/new_class_id/src/lib/physics/fields/field.cc
===================================================================
--- branches/new_class_id/src/lib/physics/fields/field.cc	(revision 9714)
+++ branches/new_class_id/src/lib/physics/fields/field.cc	(revision 9715)
@@ -23,5 +23,5 @@
 #include "util/loading/load_param.h"
 
-NewObjectListDefinition(Field);
+ObjectListDefinition(Field);
 
 /**
Index: branches/new_class_id/src/lib/physics/fields/field.h
===================================================================
--- branches/new_class_id/src/lib/physics/fields/field.h	(revision 9714)
+++ branches/new_class_id/src/lib/physics/fields/field.h	(revision 9715)
@@ -34,5 +34,5 @@
 class Field : public PNode
 {
-  NewObjectListDeclaration(Field);
+  ObjectListDeclaration(Field);
  public:
   Field();
Index: branches/new_class_id/src/lib/physics/fields/gravity.cc
===================================================================
--- branches/new_class_id/src/lib/physics/fields/gravity.cc	(revision 9714)
+++ branches/new_class_id/src/lib/physics/fields/gravity.cc	(revision 9715)
@@ -22,5 +22,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Gravity, CL_FIELD_GRAVITY);
+ObjectListDefinitionID(Gravity, CL_FIELD_GRAVITY);
 
 CREATE_FACTORY(Gravity);
Index: branches/new_class_id/src/lib/physics/fields/gravity.h
===================================================================
--- branches/new_class_id/src/lib/physics/fields/gravity.h	(revision 9714)
+++ branches/new_class_id/src/lib/physics/fields/gravity.h	(revision 9715)
@@ -16,5 +16,5 @@
 //! A class for ...
 class Gravity : public Field {
-  NewObjectListDeclaration(Gravity);
+  ObjectListDeclaration(Gravity);
 
  public:
Index: branches/new_class_id/src/lib/physics/fields/point_gravity.cc
===================================================================
--- branches/new_class_id/src/lib/physics/fields/point_gravity.cc	(revision 9714)
+++ branches/new_class_id/src/lib/physics/fields/point_gravity.cc	(revision 9715)
@@ -21,5 +21,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(PointGravity, CL_FIELD_POINT_GRAVITY);
+ObjectListDefinitionID(PointGravity, CL_FIELD_POINT_GRAVITY);
 
 
Index: branches/new_class_id/src/lib/physics/fields/point_gravity.h
===================================================================
--- branches/new_class_id/src/lib/physics/fields/point_gravity.h	(revision 9714)
+++ branches/new_class_id/src/lib/physics/fields/point_gravity.h	(revision 9715)
@@ -16,5 +16,5 @@
 //! A class for ...
 class PointGravity : public Field {
-  NewObjectListDeclaration(PointGravity);
+  ObjectListDeclaration(PointGravity);
 
  public:
Index: branches/new_class_id/src/lib/physics/fields/twirl.cc
===================================================================
--- branches/new_class_id/src/lib/physics/fields/twirl.cc	(revision 9714)
+++ branches/new_class_id/src/lib/physics/fields/twirl.cc	(revision 9715)
@@ -21,5 +21,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Twirl, CL_FIELD_TWIRL);
+ObjectListDefinitionID(Twirl, CL_FIELD_TWIRL);
 
 
Index: branches/new_class_id/src/lib/physics/fields/twirl.h
===================================================================
--- branches/new_class_id/src/lib/physics/fields/twirl.h	(revision 9714)
+++ branches/new_class_id/src/lib/physics/fields/twirl.h	(revision 9715)
@@ -16,5 +16,5 @@
 //! A class for ...
 class Twirl : public Field {
-  NewObjectListDeclaration(Twirl);
+  ObjectListDeclaration(Twirl);
 
  public:
Index: branches/new_class_id/src/lib/physics/physics_connection.cc
===================================================================
--- branches/new_class_id/src/lib/physics/physics_connection.cc	(revision 9714)
+++ branches/new_class_id/src/lib/physics/physics_connection.cc	(revision 9715)
@@ -28,5 +28,5 @@
 
 #include "class_id.h"
-NewObjectListDefinition(PhysicsConnection);
+ObjectListDefinition(PhysicsConnection);
 CREATE_FACTORY(PhysicsConnection);
 /**
Index: branches/new_class_id/src/lib/physics/physics_connection.h
===================================================================
--- branches/new_class_id/src/lib/physics/physics_connection.h	(revision 9714)
+++ branches/new_class_id/src/lib/physics/physics_connection.h	(revision 9715)
@@ -27,5 +27,5 @@
 class PhysicsConnection : public BaseObject
 {
-  NewObjectListDeclaration(PhysicsConnection);
+  ObjectListDeclaration(PhysicsConnection);
  public:
   PhysicsConnection(PhysicsInterface* subject, Field* field);
Index: branches/new_class_id/src/lib/physics/physics_engine.cc
===================================================================
--- branches/new_class_id/src/lib/physics/physics_engine.cc	(revision 9714)
+++ branches/new_class_id/src/lib/physics/physics_engine.cc	(revision 9715)
@@ -24,5 +24,5 @@
 
 
-NewObjectListDefinition(PhysicsEngine);
+ObjectListDefinition(PhysicsEngine);
 /**
  * @brief standard constructor
@@ -222,5 +222,5 @@
   /* actually tick all the PhysicsInterfaces. Move the objects around */
 
-  NewObjectList<PhysicsInterface>::const_iterator it;
+  ObjectList<PhysicsInterface>::const_iterator it;
   for (it = PhysicsInterface::objectList().begin();
        it != PhysicsInterface::objectList().end();
Index: branches/new_class_id/src/lib/physics/physics_engine.h
===================================================================
--- branches/new_class_id/src/lib/physics/physics_engine.h	(revision 9714)
+++ branches/new_class_id/src/lib/physics/physics_engine.h	(revision 9715)
@@ -22,5 +22,5 @@
 class PhysicsEngine : public BaseObject
 {
-  NewObjectListDeclaration(PhysicsEngine);
+  ObjectListDeclaration(PhysicsEngine);
 public:
   virtual ~PhysicsEngine();
Index: branches/new_class_id/src/lib/physics/physics_interface.cc
===================================================================
--- branches/new_class_id/src/lib/physics/physics_interface.cc	(revision 9714)
+++ branches/new_class_id/src/lib/physics/physics_interface.cc	(revision 9715)
@@ -31,5 +31,5 @@
 
 
-NewObjectListDefinition(PhysicsInterface);
+ObjectListDefinition(PhysicsInterface);
 /**
  * @brief standard constructor
Index: branches/new_class_id/src/lib/physics/physics_interface.h
===================================================================
--- branches/new_class_id/src/lib/physics/physics_interface.h	(revision 9714)
+++ branches/new_class_id/src/lib/physics/physics_interface.h	(revision 9715)
@@ -29,5 +29,5 @@
 class PhysicsInterface : virtual public BaseObject
 {
-  NewObjectListDeclaration(PhysicsInterface);
+  ObjectListDeclaration(PhysicsInterface);
  public:
   PhysicsInterface();
Index: branches/new_class_id/src/lib/script_engine/script.cc
===================================================================
--- branches/new_class_id/src/lib/script_engine/script.cc	(revision 9714)
+++ branches/new_class_id/src/lib/script_engine/script.cc	(revision 9715)
@@ -23,5 +23,5 @@
 #include "parser/tinyxml/tinyxml.h"
 
-NewObjectListDefinition(Script);
+ObjectListDefinition(Script);
 
 CREATE_SCRIPTABLE_CLASS(Script, Script::classID(),
@@ -155,5 +155,5 @@
      }
 
-     BaseObject* object = NewObjectListBase::getBaseObject(objectName, className);
+     BaseObject* object = ObjectListBase::getBaseObject(objectName, className);
     // printf(("%s is at %p \n",objectName.c_str(),object);
      if (object != NULL && !objectIsAdded(objectName))
Index: branches/new_class_id/src/lib/script_engine/script.h
===================================================================
--- branches/new_class_id/src/lib/script_engine/script.h	(revision 9714)
+++ branches/new_class_id/src/lib/script_engine/script.h	(revision 9715)
@@ -22,5 +22,5 @@
 class Script : public BaseObject
 {
-  NewObjectListDeclaration(Script);
+  ObjectListDeclaration(Script);
   public:
     Script(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/lib/script_engine/script_class.cc
===================================================================
--- branches/new_class_id/src/lib/script_engine/script_class.cc	(revision 9714)
+++ branches/new_class_id/src/lib/script_engine/script_class.cc	(revision 9715)
@@ -19,10 +19,10 @@
 #include <cassert>
 
-NewObjectListDefinition(ScriptClass);
+ObjectListDefinition(ScriptClass);
 /**
  * @brief standard constructor
  * @todo this constructor is not jet implemented - do it
 */
-ScriptClass::ScriptClass(const std::string& name, const NewClassID& classID, ScriptMethod* scriptMethods)
+ScriptClass::ScriptClass(const std::string& name, const ClassID& classID, ScriptMethod* scriptMethods)
     : BaseObject(name), _classID(classID)
 {
Index: branches/new_class_id/src/lib/script_engine/script_class.h
===================================================================
--- branches/new_class_id/src/lib/script_engine/script_class.h	(revision 9714)
+++ branches/new_class_id/src/lib/script_engine/script_class.h	(revision 9715)
@@ -25,5 +25,5 @@
 class ScriptClass : public BaseObject
 {
-  NewObjectListDeclaration(ScriptClass);
+  ObjectListDeclaration(ScriptClass);
 
 public:
@@ -37,8 +37,8 @@
 
 protected:
-  ScriptClass(const std::string& name, const NewClassID& classID, ScriptMethod* scriptMethods);
+  ScriptClass(const std::string& name, const ClassID& classID, ScriptMethod* scriptMethods);
 
 private:
-  NewClassID          _classID;
+  ClassID          _classID;
   ScriptMethod*       _scriptMethods;
 };
@@ -51,5 +51,5 @@
 {
 public:
-  tScriptClass(const std::string& name, NewClassID classID, ScriptMethod* scriptMethods)
+  tScriptClass(const std::string& name, ClassID classID, ScriptMethod* scriptMethods)
       : ScriptClass(name, classID, scriptMethods)
   { }
Index: branches/new_class_id/src/lib/script_engine/script_manager.cc
===================================================================
--- branches/new_class_id/src/lib/script_engine/script_manager.cc	(revision 9714)
+++ branches/new_class_id/src/lib/script_engine/script_manager.cc	(revision 9715)
@@ -97,5 +97,5 @@
 Script* ScriptManager::getScriptByFile(const std::string& file)
 {
-  for (NewObjectList<Script>::const_iterator it = Script::objectList().begin();
+  for (ObjectList<Script>::const_iterator it = Script::objectList().begin();
        it != Script::objectList().end();
        ++it)
Index: branches/new_class_id/src/lib/shell/shell.cc
===================================================================
--- branches/new_class_id/src/lib/shell/shell.cc	(revision 9714)
+++ branches/new_class_id/src/lib/shell/shell.cc	(revision 9715)
@@ -54,5 +54,5 @@
   ->completionPlugin(0, OrxShell::CompletorFileSystem(".ttf", "fonts/"));
 
-  NewObjectListDefinition(Shell);
+  ObjectListDefinition(Shell);
 
   /**
Index: branches/new_class_id/src/lib/shell/shell.h
===================================================================
--- branches/new_class_id/src/lib/shell/shell.h	(revision 9714)
+++ branches/new_class_id/src/lib/shell/shell.h	(revision 9715)
@@ -48,5 +48,5 @@
   class Shell : public Element2D, public EventListener
   {
-    NewObjectListDeclaration(Shell);
+    ObjectListDeclaration(Shell);
   public:
     Shell();
Index: branches/new_class_id/src/lib/shell/shell_command.cc
===================================================================
--- branches/new_class_id/src/lib/shell/shell_command.cc	(revision 9714)
+++ branches/new_class_id/src/lib/shell/shell_command.cc	(revision 9715)
@@ -26,5 +26,5 @@
 namespace OrxShell
 {
-  NewObjectListDefinition(ShellCommand);
+  ObjectListDefinition(ShellCommand);
   SHELL_COMMAND(debug, ShellCommandClass, help);
 
@@ -241,10 +241,10 @@
       return false;
 
-    const NewObjectListBase* const objectList = NewObjectListBase::getObjectList(cmd->shellClass->getName());
+    const ObjectListBase* const objectList = ObjectListBase::getObjectList(cmd->shellClass->getName());
     if (objectList != NULL)
     {
-      NewObjectListBase::base_list list;
+      ObjectListBase::base_list list;
       objectList->getBaseObjectList(&list);
-      NewObjectListBase::base_iterator it;
+      ObjectListBase::base_iterator it;
 
       // No Description given (only for speedup)
Index: branches/new_class_id/src/lib/shell/shell_command.h
===================================================================
--- branches/new_class_id/src/lib/shell/shell_command.h	(revision 9714)
+++ branches/new_class_id/src/lib/shell/shell_command.h	(revision 9715)
@@ -58,5 +58,5 @@
   class ShellCommand : public BaseObject
   {
-    NewObjectListDeclaration(ShellCommand);
+    ObjectListDeclaration(ShellCommand);
 
     friend class ShellCommandClass;
Index: branches/new_class_id/src/lib/shell/shell_command_class.cc
===================================================================
--- branches/new_class_id/src/lib/shell/shell_command_class.cc	(revision 9714)
+++ branches/new_class_id/src/lib/shell/shell_command_class.cc	(revision 9715)
@@ -27,5 +27,5 @@
 namespace OrxShell
 {
-  NewObjectListDefinition(ShellCommandClass);
+  ObjectListDefinition(ShellCommandClass);
 
   CmdClassList* ShellCommandClass::_commandClassList = NULL;
Index: branches/new_class_id/src/lib/shell/shell_command_class.h
===================================================================
--- branches/new_class_id/src/lib/shell/shell_command_class.h	(revision 9714)
+++ branches/new_class_id/src/lib/shell/shell_command_class.h	(revision 9715)
@@ -25,5 +25,5 @@
   class ShellCommandClass : public BaseObject
   {
-    NewObjectListDeclaration(ShellCommandClass);
+    ObjectListDeclaration(ShellCommandClass);
 
     friend class ShellCommand;
@@ -36,5 +36,5 @@
     static void unregisterAllCommands();
     static ShellCommandClass* getCommandClass(const std::string& className);
-    NewClassID getClassID();
+    ClassID getClassID();
     static bool exists(const std::string& className);
 
Index: branches/new_class_id/src/lib/shell/shell_completion.cc
===================================================================
--- branches/new_class_id/src/lib/shell/shell_completion.cc	(revision 9714)
+++ branches/new_class_id/src/lib/shell/shell_completion.cc	(revision 9715)
@@ -50,6 +50,6 @@
   bool ShellCompletion::autoComplete(std::string& input)
   {
-    NewClassID classID;
-    const NewObjectListBase* objectList = NULL;      //< the list of Objects stored in classID's ClassList
+    ClassID classID;
+    const ObjectListBase* objectList = NULL;      //< the list of Objects stored in classID's ClassList
     bool emptyComplete = false;                      //< if the completion input is empty string. e.g ""
     long completeType = NullCompletion;              //< the Type we'd like to complete.
@@ -84,5 +84,5 @@
              (!emptyComplete && inputSplits.size() == 2))
     {
-      objectList = NewObjectListBase::getObjectList(inputSplits[0]);
+      objectList = ObjectListBase::getObjectList(inputSplits[0]);
       if (objectList != NULL)
         classID = objectList->identity();
@@ -95,5 +95,5 @@
              (!emptyComplete && inputSplits.size() == 3))
     {
-      if (NewObjectListBase::getBaseObject(inputSplits[0], inputSplits[1]))
+      if (ObjectListBase::getBaseObject(inputSplits[0], inputSplits[1]))
         completeType |= FunctionCompletion;
     }
@@ -133,5 +133,5 @@
    * @return true on success, false otherwise
    */
-  bool ShellCompletion::objectComplete(const std::string& objectBegin, const NewObjectListBase* objectList)
+  bool ShellCompletion::objectComplete(const std::string& objectBegin, const ObjectListBase* objectList)
   {
     assert (objectList != NULL);
@@ -141,5 +141,5 @@
       type = ClassCompletion;
 
-    NewObjectListBase::base_list list;
+    ObjectListBase::base_list list;
     objectList->getBaseObjectList(&list);
 
Index: branches/new_class_id/src/lib/shell/shell_completion.h
===================================================================
--- branches/new_class_id/src/lib/shell/shell_completion.h	(revision 9714)
+++ branches/new_class_id/src/lib/shell/shell_completion.h	(revision 9715)
@@ -16,5 +16,5 @@
 // FORWARD DECLARATION
 class BaseObject;
-class NewObjectListBase;
+class ObjectListBase;
 
 namespace OrxShell
@@ -54,5 +54,5 @@
 
     private:
-      bool objectComplete(const std::string& objectBegin, const NewObjectListBase* const objectList);
+      bool objectComplete(const std::string& objectBegin, const ObjectListBase* const objectList);
       bool commandComplete(const std::string& commandBegin, const std::string& className);
       bool aliasComplete(const std::string& aliasBegin);
Index: branches/new_class_id/src/lib/shell/shell_input.cc
===================================================================
--- branches/new_class_id/src/lib/shell/shell_input.cc	(revision 9714)
+++ branches/new_class_id/src/lib/shell/shell_input.cc	(revision 9715)
@@ -32,5 +32,5 @@
   ->setAlias("help");
 
-  NewObjectListDefinition(ShellInput);
+  ObjectListDefinition(ShellInput);
 
   /**
Index: branches/new_class_id/src/lib/shell/shell_input.h
===================================================================
--- branches/new_class_id/src/lib/shell/shell_input.h	(revision 9714)
+++ branches/new_class_id/src/lib/shell/shell_input.h	(revision 9715)
@@ -30,5 +30,5 @@
   class ShellInput : public Text,  public EventListener
   {
-    NewObjectListDeclaration(ShellInput);
+    ObjectListDeclaration(ShellInput);
 
   public:
Index: branches/new_class_id/src/lib/sound/ogg_player.cc
===================================================================
--- branches/new_class_id/src/lib/sound/ogg_player.cc	(revision 9714)
+++ branches/new_class_id/src/lib/sound/ogg_player.cc	(revision 9715)
@@ -49,5 +49,5 @@
 namespace OrxSound
 {
-  NewObjectListDefinition(OggPlayer);
+  ObjectListDefinition(OggPlayer);
   /**
    * initializes an Ogg-player from a file
Index: branches/new_class_id/src/lib/sound/ogg_player.h
===================================================================
--- branches/new_class_id/src/lib/sound/ogg_player.h	(revision 9714)
+++ branches/new_class_id/src/lib/sound/ogg_player.h	(revision 9715)
@@ -25,5 +25,5 @@
   class OggPlayer : public BaseObject
   {
-    NewObjectListDeclaration(OggPlayer);
+    ObjectListDeclaration(OggPlayer);
 
   public:
Index: branches/new_class_id/src/lib/sound/sound_buffer.cc
===================================================================
--- branches/new_class_id/src/lib/sound/sound_buffer.cc	(revision 9714)
+++ branches/new_class_id/src/lib/sound/sound_buffer.cc	(revision 9715)
@@ -35,5 +35,5 @@
 namespace OrxSound
 {
-  NewObjectListDefinition(SoundBuffer);
+  ObjectListDefinition(SoundBuffer);
   //////////////////
   /* SOUND-BUFFER */
Index: branches/new_class_id/src/lib/sound/sound_buffer.h
===================================================================
--- branches/new_class_id/src/lib/sound/sound_buffer.h	(revision 9714)
+++ branches/new_class_id/src/lib/sound/sound_buffer.h	(revision 9715)
@@ -18,5 +18,5 @@
   class SoundBuffer : public BaseObject
   {
-    NewObjectListDeclaration(SoundBuffer);
+    ObjectListDeclaration(SoundBuffer);
   public:
     SoundBuffer(const std::string& fileName);
Index: branches/new_class_id/src/lib/sound/sound_engine.cc
===================================================================
--- branches/new_class_id/src/lib/sound/sound_engine.cc	(revision 9714)
+++ branches/new_class_id/src/lib/sound/sound_engine.cc	(revision 9715)
@@ -29,5 +29,5 @@
 namespace OrxSound
 {
-  NewObjectListDefinition(SoundEngine);
+  ObjectListDefinition(SoundEngine);
   //////////////////
   /* SOUND-ENGINE */
@@ -202,5 +202,5 @@
 
     // updating all the Sources positions
-    NewObjectList<SoundSource>::const_iterator sourceIT;
+    ObjectList<SoundSource>::const_iterator sourceIT;
     for (sourceIT = SoundSource::objectList().begin();
          sourceIT != SoundSource::objectList().end();
Index: branches/new_class_id/src/lib/sound/sound_engine.h
===================================================================
--- branches/new_class_id/src/lib/sound/sound_engine.h	(revision 9714)
+++ branches/new_class_id/src/lib/sound/sound_engine.h	(revision 9715)
@@ -27,5 +27,5 @@
   class SoundEngine : public BaseObject
   {
-    NewObjectListDeclaration(SoundEngine);
+    ObjectListDeclaration(SoundEngine);
     public:
     virtual ~SoundEngine();
Index: branches/new_class_id/src/lib/sound/sound_source.cc
===================================================================
--- branches/new_class_id/src/lib/sound/sound_source.cc	(revision 9714)
+++ branches/new_class_id/src/lib/sound/sound_source.cc	(revision 9715)
@@ -25,5 +25,5 @@
 namespace OrxSound
 {
-  NewObjectListDefinition(SoundSource);
+  ObjectListDefinition(SoundSource);
   /**
   * @brief creates a SoundSource at position sourceNode with the SoundBuffer buffer
Index: branches/new_class_id/src/lib/sound/sound_source.h
===================================================================
--- branches/new_class_id/src/lib/sound/sound_source.h	(revision 9714)
+++ branches/new_class_id/src/lib/sound/sound_source.h	(revision 9715)
@@ -18,5 +18,5 @@
   class SoundSource : public BaseObject
   {
-    NewObjectListDeclaration(SoundSource);
+    ObjectListDeclaration(SoundSource);
   public:
     SoundSource(const PNode* sourceNode = NULL, const SoundBuffer* buffer = NULL);
Index: branches/new_class_id/src/lib/util/executor/executor.cc
===================================================================
--- branches/new_class_id/src/lib/util/executor/executor.cc	(revision 9714)
+++ branches/new_class_id/src/lib/util/executor/executor.cc	(revision 9715)
@@ -19,5 +19,5 @@
 
 
-NewObjectListDefinition(Executor);
+ObjectListDefinition(Executor);
 
 /**
Index: branches/new_class_id/src/lib/util/executor/executor.h
===================================================================
--- branches/new_class_id/src/lib/util/executor/executor.h	(revision 9714)
+++ branches/new_class_id/src/lib/util/executor/executor.h	(revision 9715)
@@ -38,5 +38,5 @@
 class Executor : public BaseObject
 {
-  NewObjectListDeclaration(Executor);
+  ObjectListDeclaration(Executor);
   public:
     virtual ~Executor();
Index: branches/new_class_id/src/lib/util/loading/dynamic_loader.cc
===================================================================
--- branches/new_class_id/src/lib/util/loading/dynamic_loader.cc	(revision 9714)
+++ branches/new_class_id/src/lib/util/loading/dynamic_loader.cc	(revision 9715)
@@ -24,5 +24,5 @@
 
 
-NewObjectListDefinition(DynamicLoader);
+ObjectListDefinition(DynamicLoader);
 
 /**
Index: branches/new_class_id/src/lib/util/loading/dynamic_loader.h
===================================================================
--- branches/new_class_id/src/lib/util/loading/dynamic_loader.h	(revision 9714)
+++ branches/new_class_id/src/lib/util/loading/dynamic_loader.h	(revision 9715)
@@ -19,5 +19,5 @@
 class DynamicLoader : public Factory
 {
-  NewObjectListDeclaration(DynamicLoader);
+  ObjectListDeclaration(DynamicLoader);
 
 public:
Index: branches/new_class_id/src/lib/util/loading/factory.cc
===================================================================
--- branches/new_class_id/src/lib/util/loading/factory.cc	(revision 9714)
+++ branches/new_class_id/src/lib/util/loading/factory.cc	(revision 9715)
@@ -19,5 +19,5 @@
 //#include "shell_command.h"
 
-NewObjectListDefinition(Factory);
+ObjectListDefinition(Factory);
 
 //SHELL_COMMAND(create, Factory, fabricate);
@@ -28,5 +28,5 @@
  * set everything to zero and define factoryName
  */
-Factory::Factory (const NewClassID& classID)
+Factory::Factory (const ClassID& classID)
     : _classID(classID)
 {
@@ -140,5 +140,5 @@
  * @returns a new Object of Type classID on match, NULL otherwise
  */
-BaseObject* Factory::fabricate(const NewClassID& classID)
+BaseObject* Factory::fabricate(const ClassID& classID)
 {
   if (Factory::_factoryList == NULL)
Index: branches/new_class_id/src/lib/util/loading/factory.h
===================================================================
--- branches/new_class_id/src/lib/util/loading/factory.h	(revision 9714)
+++ branches/new_class_id/src/lib/util/loading/factory.h	(revision 9715)
@@ -39,5 +39,5 @@
 class Factory : public BaseObject
 {
-  NewObjectListDeclaration(Factory);
+  ObjectListDeclaration(Factory);
 public:
   virtual ~Factory ();
@@ -46,5 +46,5 @@
 
   static  BaseObject* fabricate(const std::string& className);
-  static  BaseObject* fabricate(const NewClassID& classID);
+  static  BaseObject* fabricate(const ClassID& classID);
   static  BaseObject* fabricate(const TiXmlElement* root);
 
@@ -52,8 +52,8 @@
   bool operator==(int classID) const;
   bool operator==(const std::string& className) const;
-  bool operator==(const NewClassID& classID) const { return _classID == classID; };
+  bool operator==(const ClassID& classID) const { return _classID == classID; };
 
 protected:
-  Factory (const NewClassID& id);
+  Factory (const ClassID& id);
   virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const = 0;
 
@@ -62,5 +62,5 @@
 
 protected:
-  const NewClassID              _classID;              //!< The Class-Identifyer of the Factory.
+  const ClassID              _classID;              //!< The Class-Identifyer of the Factory.
   static std::list<Factory*>*   _factoryList;          //!< List of Registered Factories
 };
@@ -78,5 +78,5 @@
    * @param classID the ID of the Class to be created.
    */
-  tFactory (const NewClassID& classID)
+  tFactory (const ClassID& classID)
       : Factory(classID)
   {  }
Index: branches/new_class_id/src/lib/util/loading/fast_factory.cc
===================================================================
--- branches/new_class_id/src/lib/util/loading/fast_factory.cc	(revision 9714)
+++ branches/new_class_id/src/lib/util/loading/fast_factory.cc	(revision 9715)
@@ -22,5 +22,5 @@
 
 
-NewObjectListDefinition(FastFactory);
+ObjectListDefinition(FastFactory);
 
 /**
@@ -30,5 +30,5 @@
  * @return a new FastFactory
  */
-FastFactory::FastFactory (const NewClassID& classID, const std::string& fastFactoryName)
+FastFactory::FastFactory (const ClassID& classID, const std::string& fastFactoryName)
 {
   this->registerObject(this, FastFactory::_objectList);
@@ -98,5 +98,5 @@
  * @returns true if found, false otherwise.
  */
-FastFactory* FastFactory::searchFastFactory(const NewClassID& classID)
+FastFactory* FastFactory::searchFastFactory(const ClassID& classID)
 {
   if (FastFactory::first == NULL)
@@ -229,5 +229,5 @@
  * @return the Object to resurrect, NULL if classID is not found.
  */
-BaseObject* FastFactory::resurrect(const NewClassID& classID)
+BaseObject* FastFactory::resurrect(const ClassID& classID)
 {
   FastFactory* tmpFac = FastFactory::getFirst();
Index: branches/new_class_id/src/lib/util/loading/fast_factory.h
===================================================================
--- branches/new_class_id/src/lib/util/loading/fast_factory.h	(revision 9714)
+++ branches/new_class_id/src/lib/util/loading/fast_factory.h	(revision 9715)
@@ -60,5 +60,5 @@
 class FastFactory : public BaseObject
 {
-  NewObjectListDeclaration(FastFactory);
+  ObjectListDeclaration(FastFactory);
 
 public:
@@ -68,5 +68,5 @@
   // functions to push and pop elements of this class
   BaseObject* resurrect();
-  static BaseObject* resurrect(const NewClassID& classID);
+  static BaseObject* resurrect(const ClassID& classID);
   void kill(BaseObject* object);
   static void kill(BaseObject* object, bool searchForFastFactory);
@@ -80,11 +80,11 @@
   inline static FastFactory* getFirst() { return FastFactory::first; };
 
-  static FastFactory* searchFastFactory(const NewClassID& classID);
+  static FastFactory* searchFastFactory(const ClassID& classID);
   static FastFactory* searchFastFactory(const std::string& fastFactoryName);
 
-  const NewClassID& getStoredID() const { return this->storedClassID; };
+  const ClassID& getStoredID() const { return this->storedClassID; };
 
 protected:
-  FastFactory (const NewClassID& classID, const std::string& fastFactoryName = "");
+  FastFactory (const ClassID& classID, const std::string& fastFactoryName = "");
 
   /** sets the Next factory in the list @param nextFactory the next factory */
@@ -100,5 +100,5 @@
 
 protected:
-  NewClassID            storedClassID;        //!< The classID of the specified class.
+  ClassID            storedClassID;        //!< The classID of the specified class.
   unsigned int          storedDeadObjects;    //!< How many dead objects are stored in this class
 
@@ -122,8 +122,8 @@
 {
 public:
-  static tFastFactory<T>* getFastFactory(const NewClassID& classID, const std::string& fastFactoryName);
+  static tFastFactory<T>* getFastFactory(const ClassID& classID, const std::string& fastFactoryName);
 
 private:
-  tFastFactory(const NewClassID& classID, const std::string& fastFactoryName);
+  tFastFactory(const ClassID& classID, const std::string& fastFactoryName);
 
   virtual void fabricate();
@@ -137,5 +137,5 @@
  */
 template<class T>
-tFastFactory<T>::tFastFactory(const NewClassID& classID, const std::string& fastFactoryName)
+tFastFactory<T>::tFastFactory(const ClassID& classID, const std::string& fastFactoryName)
     : FastFactory(classID, fastFactoryName)
 {}
@@ -148,5 +148,5 @@
  */
 template<class T>
-tFastFactory<T>* tFastFactory<T>::getFastFactory(const NewClassID& classID, const std::string& fastFactoryName)
+tFastFactory<T>* tFastFactory<T>::getFastFactory(const ClassID& classID, const std::string& fastFactoryName)
 {
   tFastFactory<T>* tmpFac = NULL;
Index: branches/new_class_id/src/lib/util/loading/game_loader.cc
===================================================================
--- branches/new_class_id/src/lib/util/loading/game_loader.cc	(revision 9714)
+++ branches/new_class_id/src/lib/util/loading/game_loader.cc	(revision 9715)
@@ -28,5 +28,5 @@
 #include "key_mapper.h"
 
-NewObjectListDefinition(GameLoader);
+ObjectListDefinition(GameLoader);
 
 
Index: branches/new_class_id/src/lib/util/loading/game_loader.h
===================================================================
--- branches/new_class_id/src/lib/util/loading/game_loader.h	(revision 9714)
+++ branches/new_class_id/src/lib/util/loading/game_loader.h	(revision 9715)
@@ -38,5 +38,5 @@
 class GameLoader : public EventListener
 {
-  NewObjectListDeclaration(GameLoader);
+  ObjectListDeclaration(GameLoader);
   public:
   virtual ~GameLoader ();
Index: branches/new_class_id/src/lib/util/loading/resource.h
===================================================================
--- branches/new_class_id/src/lib/util/loading/resource.h	(revision 9714)
+++ branches/new_class_id/src/lib/util/loading/resource.h	(revision 9715)
@@ -37,10 +37,10 @@
   {
   public:
-    Type(const NewClassID& classID) : _classID(classID) { };
+    Type(const ClassID& classID) : _classID(classID) { };
 
     void addExtension(const std::string& extension);
 
   private:
-    const NewClassID&                _classID;
+    const ClassID&                _classID;
     std::vector<std::string>      _resourcePaths;
     std::vector<std::string>      _resourceSubPaths;
@@ -73,5 +73,5 @@
   unsigned int      referenceCount;    //!< How many times this Resource has been loaded.
   /// TODO REMOVE THIS:   ResourceType      type;              //!< ResourceType of this Resource.
-  ResourcePriority  prio;              //!< The Priority of this resource. (can only be increased, so noone else will delete this)
+  Resource::Priority  prio;              //!< The Priority of this resource. (can only be increased, so noone else will delete this)
 
   MultiType         param[3];          //!< The Parameters given to this Resource.
Index: branches/new_class_id/src/lib/util/loading/resource_manager.cc
===================================================================
--- branches/new_class_id/src/lib/util/loading/resource_manager.cc	(revision 9714)
+++ branches/new_class_id/src/lib/util/loading/resource_manager.cc	(revision 9715)
@@ -50,5 +50,5 @@
 #include <unistd.h>
 
-NewObjectListDefinition(ResourceManager);
+ObjectListDefinition(ResourceManager);
 
 /**
Index: branches/new_class_id/src/lib/util/loading/resource_manager.h
===================================================================
--- branches/new_class_id/src/lib/util/loading/resource_manager.h	(revision 9714)
+++ branches/new_class_id/src/lib/util/loading/resource_manager.h	(revision 9715)
@@ -94,5 +94,5 @@
 class ResourceManager : public BaseObject
 {
-  NewObjectListDeclaration(ResourceManager);
+  ObjectListDeclaration(ResourceManager);
 public:
   virtual ~ResourceManager();
Index: branches/new_class_id/src/lib/util/preferences.cc
===================================================================
--- branches/new_class_id/src/lib/util/preferences.cc	(revision 9714)
+++ branches/new_class_id/src/lib/util/preferences.cc	(revision 9715)
@@ -20,5 +20,5 @@
 #include "debug.h"
 
-NewObjectListDefinition(Preferences);
+ObjectListDefinition(Preferences);
 
 /**
Index: branches/new_class_id/src/lib/util/preferences.h
===================================================================
--- branches/new_class_id/src/lib/util/preferences.h	(revision 9714)
+++ branches/new_class_id/src/lib/util/preferences.h	(revision 9715)
@@ -29,5 +29,5 @@
 //! A default singleton class.
 class Preferences : public BaseObject {
-  NewObjectListDeclaration(Preferences);
+  ObjectListDeclaration(Preferences);
  public:
    virtual ~Preferences(void);
Index: branches/new_class_id/src/orxonox.cc
===================================================================
--- branches/new_class_id/src/orxonox.cc	(revision 9714)
+++ branches/new_class_id/src/orxonox.cc	(revision 9715)
@@ -96,5 +96,5 @@
 REGISTER_ARG_ARG(  _, write_dict,  "compression", "writedict",    "write packets to DATA/dicts/newdict",               "numBytes" );
 
-NewObjectListDefinition(Orxonox);
+ObjectListDefinition(Orxonox);
 
 /**
@@ -148,5 +148,5 @@
 
 
-  NewObjectListBase::debugAll(1);
+  ObjectListBase::debugAll(1);
 
   Preferences::getInstance()->save();
Index: branches/new_class_id/src/orxonox.h
===================================================================
--- branches/new_class_id/src/orxonox.h	(revision 9714)
+++ branches/new_class_id/src/orxonox.h	(revision 9715)
@@ -16,5 +16,5 @@
 */
 class Orxonox : public BaseObject {
-  NewObjectListDeclaration(Orxonox);
+  ObjectListDeclaration(Orxonox);
 
  public:
Index: branches/new_class_id/src/story_entities/campaign.cc
===================================================================
--- branches/new_class_id/src/story_entities/campaign.cc	(revision 9714)
+++ branches/new_class_id/src/story_entities/campaign.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 
-NewObjectListDefinition(Campaign);
+ObjectListDefinition(Campaign);
 
 /**
Index: branches/new_class_id/src/story_entities/campaign.h
===================================================================
--- branches/new_class_id/src/story_entities/campaign.h	(revision 9714)
+++ branches/new_class_id/src/story_entities/campaign.h	(revision 9715)
@@ -18,5 +18,5 @@
 class Campaign : public StoryEntity
 {
-  NewObjectListDeclaration(Campaign);
+  ObjectListDeclaration(Campaign);
   public:
     Campaign( TiXmlElement* root);
Index: branches/new_class_id/src/story_entities/campaign_data.cc
===================================================================
--- branches/new_class_id/src/story_entities/campaign_data.cc	(revision 9714)
+++ branches/new_class_id/src/story_entities/campaign_data.cc	(revision 9715)
@@ -25,5 +25,5 @@
 
 
-NewObjectListDefinition(CampaignData);
+ObjectListDefinition(CampaignData);
 
 /**
Index: branches/new_class_id/src/story_entities/campaign_data.h
===================================================================
--- branches/new_class_id/src/story_entities/campaign_data.h	(revision 9714)
+++ branches/new_class_id/src/story_entities/campaign_data.h	(revision 9715)
@@ -16,5 +16,5 @@
 class CampaignData : public DataTank
 {
-  NewObjectListDeclaration(CampaignData);
+  ObjectListDeclaration(CampaignData);
 
 public:
Index: branches/new_class_id/src/story_entities/game_world.cc
===================================================================
--- branches/new_class_id/src/story_entities/game_world.cc	(revision 9714)
+++ branches/new_class_id/src/story_entities/game_world.cc	(revision 9715)
@@ -62,5 +62,5 @@
 
 #include "script_class.h"
-NewObjectListDefinition(GameWorld);
+ObjectListDefinition(GameWorld);
 CREATE_SCRIPTABLE_CLASS(GameWorld, GameWorld::classID(),
                         addMethod("setPlaymode", ExecutorLua1<GameWorld,const std::string&>(&GameWorld::setPlaymode))
@@ -568,5 +568,5 @@
   MappedWater* mw;
 
-  for (NewObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
+  for (ObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
        it != MappedWater::objectList().end();
        ++it)
@@ -607,5 +607,5 @@
   MappedWater* mw;
 
-  for (NewObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
+  for (ObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
        it != MappedWater::objectList().end();
        ++it)
Index: branches/new_class_id/src/story_entities/game_world.h
===================================================================
--- branches/new_class_id/src/story_entities/game_world.h	(revision 9714)
+++ branches/new_class_id/src/story_entities/game_world.h	(revision 9715)
@@ -31,5 +31,5 @@
 class GameWorld : public StoryEntity
 {
-  NewObjectListDeclaration(GameWorld);
+  ObjectListDeclaration(GameWorld);
 
 public:
Index: branches/new_class_id/src/story_entities/game_world_data.cc
===================================================================
--- branches/new_class_id/src/story_entities/game_world_data.cc	(revision 9714)
+++ branches/new_class_id/src/story_entities/game_world_data.cc	(revision 9715)
@@ -61,5 +61,5 @@
 
 
-NewObjectListDefinition(GameWorldData);
+ObjectListDefinition(GameWorldData);
 /**
  * constructor of the GameWorldData
Index: branches/new_class_id/src/story_entities/game_world_data.h
===================================================================
--- branches/new_class_id/src/story_entities/game_world_data.h	(revision 9714)
+++ branches/new_class_id/src/story_entities/game_world_data.h	(revision 9715)
@@ -30,5 +30,5 @@
 class GameWorldData : public DataTank
 {
-  NewObjectListDeclaration(GameWorldData);
+  ObjectListDeclaration(GameWorldData);
   public:
     GameWorldData();
Index: branches/new_class_id/src/story_entities/menu/game_menu.cc
===================================================================
--- branches/new_class_id/src/story_entities/menu/game_menu.cc	(revision 9714)
+++ branches/new_class_id/src/story_entities/menu/game_menu.cc	(revision 9715)
@@ -44,5 +44,5 @@
 #include "class_id.h"
 //! This creates a Factory to fabricate a GameMenu
-NewObjectListDefinitionID(GameMenu, CL_GAME_MENU);
+ObjectListDefinitionID(GameMenu, CL_GAME_MENU);
 CREATE_FACTORY(GameMenu);
 
@@ -192,5 +192,5 @@
 
       bool first = true;
-      for(NewObjectList<StoryEntity>::const_iterator it = StoryEntity::objectList().begin();
+      for(ObjectList<StoryEntity>::const_iterator it = StoryEntity::objectList().begin();
 	  it != StoryEntity::objectList().end();
 	  ++it)
Index: branches/new_class_id/src/story_entities/menu/game_menu.h
===================================================================
--- branches/new_class_id/src/story_entities/menu/game_menu.h	(revision 9714)
+++ branches/new_class_id/src/story_entities/menu/game_menu.h	(revision 9715)
@@ -22,5 +22,5 @@
 class GameMenu : virtual public GameWorld, virtual public EventListener
 {
-  NewObjectListDeclaration(GameMenu);
+  ObjectListDeclaration(GameMenu);
   public:
     GameMenu(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/story_entities/movie_loader.cc
===================================================================
--- branches/new_class_id/src/story_entities/movie_loader.cc	(revision 9714)
+++ branches/new_class_id/src/story_entities/movie_loader.cc	(revision 9715)
@@ -26,5 +26,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(MovieLoader, CL_MOVIE_LOADER);
+ObjectListDefinitionID(MovieLoader, CL_MOVIE_LOADER);
 CREATE_FACTORY(MovieLoader);
 
Index: branches/new_class_id/src/story_entities/movie_loader.h
===================================================================
--- branches/new_class_id/src/story_entities/movie_loader.h	(revision 9714)
+++ branches/new_class_id/src/story_entities/movie_loader.h	(revision 9715)
@@ -15,5 +15,5 @@
 class MovieLoader : public StoryEntity, virtual public EventListener
 {
-  NewObjectListDeclaration(MovieLoader);
+  ObjectListDeclaration(MovieLoader);
   private:
     MoviePlayer* movie_player;
Index: branches/new_class_id/src/story_entities/multi_player_world.cc
===================================================================
--- branches/new_class_id/src/story_entities/multi_player_world.cc	(revision 9714)
+++ branches/new_class_id/src/story_entities/multi_player_world.cc	(revision 9715)
@@ -38,5 +38,5 @@
 #include "class_id.h"
 //! This creates a Factory to fabricate a MultiPlayerWorld
-NewObjectListDefinitionID(MultiPlayerWorld, CL_MULTI_PLAYER_WORLD);
+ObjectListDefinitionID(MultiPlayerWorld, CL_MULTI_PLAYER_WORLD);
 CREATE_FACTORY(MultiPlayerWorld);
 
Index: branches/new_class_id/src/story_entities/multi_player_world.h
===================================================================
--- branches/new_class_id/src/story_entities/multi_player_world.h	(revision 9714)
+++ branches/new_class_id/src/story_entities/multi_player_world.h	(revision 9715)
@@ -20,5 +20,5 @@
  */
 class MultiPlayerWorld : public GameWorld {
-  NewObjectListDeclaration(MultiPlayerWorld);
+  ObjectListDeclaration(MultiPlayerWorld);
  public:
   MultiPlayerWorld (const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/story_entities/multi_player_world_data.cc
===================================================================
--- branches/new_class_id/src/story_entities/multi_player_world_data.cc	(revision 9714)
+++ branches/new_class_id/src/story_entities/multi_player_world_data.cc	(revision 9715)
@@ -311,5 +311,5 @@
   Playable* playable;
 
-  for (NewObjectList<Playable>::const_iterator entity = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator entity = Playable::objectList().begin();
        entity != Playable::objectList().end();
       ++entity)
Index: branches/new_class_id/src/story_entities/single_player_world.cc
===================================================================
--- branches/new_class_id/src/story_entities/single_player_world.cc	(revision 9714)
+++ branches/new_class_id/src/story_entities/single_player_world.cc	(revision 9715)
@@ -31,5 +31,5 @@
 #include "class_id.h"
 //! This creates a Factory to fabricate a SinglePlayerWorld
-NewObjectListDefinitionID(SinglePlayerWorld, CL_SINGLE_PLAYER_WORLD);
+ObjectListDefinitionID(SinglePlayerWorld, CL_SINGLE_PLAYER_WORLD);
 CREATE_FACTORY(SinglePlayerWorld);
 
Index: branches/new_class_id/src/story_entities/single_player_world.h
===================================================================
--- branches/new_class_id/src/story_entities/single_player_world.h	(revision 9714)
+++ branches/new_class_id/src/story_entities/single_player_world.h	(revision 9715)
@@ -22,5 +22,5 @@
 class SinglePlayerWorld : public GameWorld
 {
-  NewObjectListDeclaration(SinglePlayerWorld);
+  ObjectListDeclaration(SinglePlayerWorld);
 
   public:
Index: branches/new_class_id/src/story_entities/story_entity.cc
===================================================================
--- branches/new_class_id/src/story_entities/story_entity.cc	(revision 9714)
+++ branches/new_class_id/src/story_entities/story_entity.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 
-NewObjectListDefinition(StoryEntity);
+ObjectListDefinition(StoryEntity);
 
 /**
Index: branches/new_class_id/src/story_entities/story_entity.h
===================================================================
--- branches/new_class_id/src/story_entities/story_entity.h	(revision 9714)
+++ branches/new_class_id/src/story_entities/story_entity.h	(revision 9715)
@@ -26,5 +26,5 @@
 class StoryEntity : virtual public BaseObject
 {
-  NewObjectListDeclaration(StoryEntity);
+  ObjectListDeclaration(StoryEntity);
 
 public:
Index: branches/new_class_id/src/util/animation/animation.cc
===================================================================
--- branches/new_class_id/src/util/animation/animation.cc	(revision 9714)
+++ branches/new_class_id/src/util/animation/animation.cc	(revision 9715)
@@ -20,5 +20,5 @@
 #include "animation_player.h"
 
-NewObjectListDefinition(Animation);
+ObjectListDefinition(Animation);
 /**
  *  creates a new Animation
Index: branches/new_class_id/src/util/animation/animation.h
===================================================================
--- branches/new_class_id/src/util/animation/animation.h	(revision 9714)
+++ branches/new_class_id/src/util/animation/animation.h	(revision 9715)
@@ -73,5 +73,5 @@
 class Animation : public BaseObject
 {
-  NewObjectListDeclaration(Animation);
+  ObjectListDeclaration(Animation);
 public:
   virtual ~Animation();
Index: branches/new_class_id/src/util/animation/animation_player.cc
===================================================================
--- branches/new_class_id/src/util/animation/animation_player.cc	(revision 9714)
+++ branches/new_class_id/src/util/animation/animation_player.cc	(revision 9715)
@@ -22,5 +22,5 @@
 
 
-NewObjectListDefinition(AnimationPlayer);
+ObjectListDefinition(AnimationPlayer);
 /**
  *  standard constructor
Index: branches/new_class_id/src/util/animation/animation_player.h
===================================================================
--- branches/new_class_id/src/util/animation/animation_player.h	(revision 9714)
+++ branches/new_class_id/src/util/animation/animation_player.h	(revision 9715)
@@ -30,5 +30,5 @@
 class AnimationPlayer : public BaseObject
 {
-  NewObjectListDeclaration(AnimationPlayer);
+  ObjectListDeclaration(AnimationPlayer);
 
 public:
Index: branches/new_class_id/src/util/game_rules.cc
===================================================================
--- branches/new_class_id/src/util/game_rules.cc	(revision 9714)
+++ branches/new_class_id/src/util/game_rules.cc	(revision 9715)
@@ -28,5 +28,5 @@
 
 
-NewObjectListDefinition(GameRules);
+ObjectListDefinition(GameRules);
 
 /**
Index: branches/new_class_id/src/util/game_rules.h
===================================================================
--- branches/new_class_id/src/util/game_rules.h	(revision 9714)
+++ branches/new_class_id/src/util/game_rules.h	(revision 9715)
@@ -23,5 +23,5 @@
 class GameRules : virtual public BaseObject
 {
-  NewObjectListDeclaration(GameRules);
+  ObjectListDeclaration(GameRules);
 
   public:
Index: branches/new_class_id/src/util/hud.cc
===================================================================
--- branches/new_class_id/src/util/hud.cc	(revision 9714)
+++ branches/new_class_id/src/util/hud.cc	(revision 9715)
@@ -34,5 +34,5 @@
 #include "playable.h"
 
-NewObjectListDefinition(Hud);
+ObjectListDefinition(Hud);
 /**
  * standard constructor
Index: branches/new_class_id/src/util/hud.h
===================================================================
--- branches/new_class_id/src/util/hud.h	(revision 9714)
+++ branches/new_class_id/src/util/hud.h	(revision 9715)
@@ -23,5 +23,5 @@
 class Hud : public Element2D, public EventListener
 {
-  NewObjectListDeclaration(Hud);
+  ObjectListDeclaration(Hud);
 
 public:
Index: branches/new_class_id/src/util/kill_target.cc
===================================================================
--- branches/new_class_id/src/util/kill_target.cc	(revision 9714)
+++ branches/new_class_id/src/util/kill_target.cc	(revision 9715)
@@ -23,5 +23,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(KillTarget, CL_KILL_TARGET);
+ObjectListDefinitionID(KillTarget, CL_KILL_TARGET);
 CREATE_FACTORY(KillTarget);
 
Index: branches/new_class_id/src/util/kill_target.h
===================================================================
--- branches/new_class_id/src/util/kill_target.h	(revision 9714)
+++ branches/new_class_id/src/util/kill_target.h	(revision 9715)
@@ -17,5 +17,5 @@
 class KillTarget : public MissionGoal
 {
-  NewObjectListDeclaration(KillTarget);
+  ObjectListDeclaration(KillTarget);
 
   public:
Index: branches/new_class_id/src/util/mission_goal.cc
===================================================================
--- branches/new_class_id/src/util/mission_goal.cc	(revision 9714)
+++ branches/new_class_id/src/util/mission_goal.cc	(revision 9715)
@@ -24,5 +24,5 @@
 
 
-NewObjectListDefinition(MissionGoal);
+ObjectListDefinition(MissionGoal);
 /**
  * standard constructor
Index: branches/new_class_id/src/util/mission_goal.h
===================================================================
--- branches/new_class_id/src/util/mission_goal.h	(revision 9714)
+++ branches/new_class_id/src/util/mission_goal.h	(revision 9715)
@@ -26,5 +26,5 @@
 //! A class representing a mission goal
 class MissionGoal : public BaseObject {
-  NewObjectListDeclaration(MissionGoal);
+  ObjectListDeclaration(MissionGoal);
 
  public:
Index: branches/new_class_id/src/util/multiplayer_team_deathmatch.cc
===================================================================
--- branches/new_class_id/src/util/multiplayer_team_deathmatch.cc	(revision 9714)
+++ branches/new_class_id/src/util/multiplayer_team_deathmatch.cc	(revision 9715)
@@ -50,5 +50,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(MultiplayerTeamDeathmatch, CL_MULTIPLAYER_TEAM_DEATHMATCH);
+ObjectListDefinitionID(MultiplayerTeamDeathmatch, CL_MULTIPLAYER_TEAM_DEATHMATCH);
 CREATE_FACTORY(MultiplayerTeamDeathmatch);
 /**
@@ -301,11 +301,11 @@
 }
 
-NewClassID MultiplayerTeamDeathmatch::getPlayableClassId( int userId, int team )
+ClassID MultiplayerTeamDeathmatch::getPlayableClassId( int userId, int team )
 {
   if ( team == TEAM_NOTEAM || team == TEAM_SPECTATOR )
-    return NewObjectListBase::retrieveIdentity("Spectator");
+    return ObjectListBase::retrieveIdentity("Spectator");
 
   if ( team == 0 || team == 1 )
-    return NewObjectListBase::retrieveIdentity("TurbineHover");
+    return ObjectListBase::retrieveIdentity("TurbineHover");
 
   assert( false );
@@ -313,5 +313,5 @@
 
 
-std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, const NewClassID& classId )
+std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, const ClassID& classId )
 {
   if (classId == CL_TURBINE_HOVER)
@@ -325,5 +325,5 @@
 }
 
-std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId )
+std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, const ClassID& classId )
 {
   if ( classId == CL_FPS_PLAYER )
@@ -338,7 +338,7 @@
 }
 
-float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, const NewClassID& classId )
-{
-  if ( classId == NewObjectListBase::retrieveIdentity(CL_FPS_PLAYER))
+float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, const ClassID& classId )
+{
+  if ( classId == ObjectListBase::retrieveIdentity(CL_FPS_PLAYER))
   {
     return 10.0f;
@@ -358,5 +358,5 @@
     teamScore[i] = 0;
 
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)
@@ -382,5 +382,5 @@
     playersInTeam[i] = 0;
 
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)
@@ -442,5 +442,5 @@
 void MultiplayerTeamDeathmatch::handleTeamChanges( )
 {
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)
@@ -458,5 +458,5 @@
 
   //now serve player who want join a random team
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)
@@ -491,5 +491,5 @@
 
 
-  NewClassID       playableClassId  = getPlayableClassId( userId, stats.getPreferedTeamId() );
+  ClassID       playableClassId  = getPlayableClassId( userId, stats.getPreferedTeamId() );
   std::string   playableModel    = getPlayableModelFileName( userId, stats.getPreferedTeamId(), playableClassId );
   std::string   playableTexture  = getPlayableModelTextureFileName( userId, stats.getPreferedTeamId(), playableClassId );
@@ -813,5 +813,5 @@
   std::vector<SpawningPoint*> spList;
 
-  for (NewObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
+  for (ObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
        it != SpawningPoint::objectList().end();
        ++it)
@@ -825,5 +825,5 @@
   if ( spList.size() == 0 )
   {
-    for (NewObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
+    for (ObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
 	 it != SpawningPoint::objectList().end();
 	 ++it)
Index: branches/new_class_id/src/util/multiplayer_team_deathmatch.h
===================================================================
--- branches/new_class_id/src/util/multiplayer_team_deathmatch.h	(revision 9714)
+++ branches/new_class_id/src/util/multiplayer_team_deathmatch.h	(revision 9715)
@@ -30,5 +30,5 @@
 class MultiplayerTeamDeathmatch : public NetworkGameRules, public EventListener
 {
-  NewObjectListDeclaration(MultiplayerTeamDeathmatch);
+  ObjectListDeclaration(MultiplayerTeamDeathmatch);
 
   public:
@@ -39,8 +39,8 @@
 
     virtual int getTeamForNewUser();
-    virtual NewClassID getPlayableClassId( int userId, int team );
-    virtual std::string getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId );
-    virtual std::string getPlayableModelFileName( int userId, int team, const NewClassID& classId );
-    virtual float getPlayableScale( int userId, int team, const NewClassID& classId );
+    virtual ClassID getPlayableClassId( int userId, int team );
+    virtual std::string getPlayableModelTextureFileName( int userId, int team, const ClassID& classId );
+    virtual std::string getPlayableModelFileName( int userId, int team, const ClassID& classId );
+    virtual float getPlayableScale( int userId, int team, const ClassID& classId );
 
     virtual void registerSpawn( WorldEntity * we );
Index: branches/new_class_id/src/util/network_game_rules.cc
===================================================================
--- branches/new_class_id/src/util/network_game_rules.cc	(revision 9714)
+++ branches/new_class_id/src/util/network_game_rules.cc	(revision 9715)
@@ -22,5 +22,5 @@
 
 
-NewObjectListDefinition(NetworkGameRules);
+ObjectListDefinition(NetworkGameRules);
 
 /**
@@ -41,21 +41,21 @@
 
 
-std::string NetworkGameRules::getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId )
+std::string NetworkGameRules::getPlayableModelTextureFileName( int userId, int team, const ClassID& classId )
 {
   return "";
 }
 
-std::string NetworkGameRules::getPlayableModelFileName( int uesrId, int team, const NewClassID& classId )
+std::string NetworkGameRules::getPlayableModelFileName( int uesrId, int team, const ClassID& classId )
 {
   return "models/ships/reap_#.obj";
 }
 
-NewClassID NetworkGameRules::getPlayableClassId( int userId, int team )
+ClassID NetworkGameRules::getPlayableClassId( int userId, int team )
 {
-  const NewObjectListBase* objList = NewObjectListBase::getObjectList("SpaceShip");
+  const ObjectListBase* objList = ObjectListBase::getObjectList("SpaceShip");
   if (objList != NULL)
     return objList->identity();
   else
-    return NewClassID();
+    return ClassID();
 }
 
@@ -72,5 +72,5 @@
 
 
-float NetworkGameRules::getPlayableScale( int userId, int team, const NewClassID& classId )
+float NetworkGameRules::getPlayableScale( int userId, int team, const ClassID& classId )
 {
   return 1.0f;
Index: branches/new_class_id/src/util/network_game_rules.h
===================================================================
--- branches/new_class_id/src/util/network_game_rules.h	(revision 9714)
+++ branches/new_class_id/src/util/network_game_rules.h	(revision 9715)
@@ -15,5 +15,5 @@
 class NetworkGameRules : public GameRules
 {
-  NewObjectListDeclaration(NetworkGameRules);
+  ObjectListDeclaration(NetworkGameRules);
 
   public:
@@ -22,8 +22,8 @@
 
     virtual int getTeamForNewUser();
-    virtual NewClassID getPlayableClassId( int userId, int team );
-    virtual std::string getPlayableModelFileName( int userId, int team, const NewClassID& classId );
-    virtual std::string getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId );
-    virtual float getPlayableScale( int userId, int team, const NewClassID& classId );
+    virtual ClassID getPlayableClassId( int userId, int team );
+    virtual std::string getPlayableModelFileName( int userId, int team, const ClassID& classId );
+    virtual std::string getPlayableModelTextureFileName( int userId, int team, const ClassID& classId );
+    virtual float getPlayableScale( int userId, int team, const ClassID& classId );
 
     virtual PlayerStats * getNewPlayerStats( int userId ){ return new PlayerStats( userId ); }
Index: branches/new_class_id/src/util/object_manager.cc
===================================================================
--- branches/new_class_id/src/util/object_manager.cc	(revision 9714)
+++ branches/new_class_id/src/util/object_manager.cc	(revision 9715)
@@ -29,5 +29,5 @@
     ->defaultValues("", 0);
 
-NewObjectListDefinition(ObjectManager);
+ObjectListDefinition(ObjectManager);
 /**
  * @brief standard constructor
@@ -112,5 +112,5 @@
  */
   /*
-void ObjectManager::distanceFromObject(EntityList& entities, const PNode& center, float radius, const NewClassID& classID)
+void ObjectManager::distanceFromObject(EntityList& entities, const PNode& center, float radius, const ClassID& classID)
 {
   TODO FIXME
Index: branches/new_class_id/src/util/object_manager.h
===================================================================
--- branches/new_class_id/src/util/object_manager.h	(revision 9714)
+++ branches/new_class_id/src/util/object_manager.h	(revision 9715)
@@ -73,5 +73,5 @@
 class ObjectManager : public BaseObject
 {
-  NewObjectListDeclaration(ObjectManager);
+  ObjectListDeclaration(ObjectManager);
 public:
   typedef std::list<WorldEntity*> EntityList;      //!< A type definition to make it easy to use EntityLists.
@@ -91,5 +91,5 @@
   const EntityList& getEntityList(OM_LIST listNumber) const { return this->entityLists[listNumber]; }
 
-  template <class T> static void distanceFromObject(EntityList& entities, const PNode& center, float radius, NewObjectList<T>& list);
+  template <class T> static void distanceFromObject(EntityList& entities, const PNode& center, float radius, ObjectList<T>& list);
 
   void debug(OM_LIST omList, unsigned int level = 0) const;
Index: branches/new_class_id/src/util/singleplayer_shootemup.cc
===================================================================
--- branches/new_class_id/src/util/singleplayer_shootemup.cc	(revision 9714)
+++ branches/new_class_id/src/util/singleplayer_shootemup.cc	(revision 9715)
@@ -26,5 +26,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(SingleplayerShootemup, CL_SINGLEPLAYER_SHOOTEMUP);
+ObjectListDefinitionID(SingleplayerShootemup, CL_SINGLEPLAYER_SHOOTEMUP);
 CREATE_FACTORY(SingleplayerShootemup);
 
Index: branches/new_class_id/src/util/singleplayer_shootemup.h
===================================================================
--- branches/new_class_id/src/util/singleplayer_shootemup.h	(revision 9714)
+++ branches/new_class_id/src/util/singleplayer_shootemup.h	(revision 9715)
@@ -18,5 +18,5 @@
 class SingleplayerShootemup : public GameRules
 {
-  NewObjectListDeclaration(SingleplayerShootemup);
+  ObjectListDeclaration(SingleplayerShootemup);
   public:
     SingleplayerShootemup(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/util/track/pilot_node.cc
===================================================================
--- branches/new_class_id/src/util/track/pilot_node.cc	(revision 9714)
+++ branches/new_class_id/src/util/track/pilot_node.cc	(revision 9715)
@@ -24,5 +24,5 @@
 
 
-NewObjectListDefinition(PilotNode);
+ObjectListDefinition(PilotNode);
 /**
  *  standard constructor
Index: branches/new_class_id/src/util/track/pilot_node.h
===================================================================
--- branches/new_class_id/src/util/track/pilot_node.h	(revision 9714)
+++ branches/new_class_id/src/util/track/pilot_node.h	(revision 9715)
@@ -15,5 +15,5 @@
 //! The PilotNode is a node that enables the is driven by the Mouse
 class PilotNode : public WorldEntity, public EventListener {
-  NewObjectListDeclaration(PilotNode);
+  ObjectListDeclaration(PilotNode);
 
  public:
Index: branches/new_class_id/src/world_entities/bsp_entity.cc
===================================================================
--- branches/new_class_id/src/world_entities/bsp_entity.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/bsp_entity.cc	(revision 9715)
@@ -19,5 +19,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(BspEntity, CL_BSP_ENTITY);
+ObjectListDefinitionID(BspEntity, CL_BSP_ENTITY);
 CREATE_FACTORY(BspEntity);
 
Index: branches/new_class_id/src/world_entities/bsp_entity.h
===================================================================
--- branches/new_class_id/src/world_entities/bsp_entity.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/bsp_entity.h	(revision 9715)
@@ -18,5 +18,5 @@
 class BspEntity : public WorldEntity
 {
-  NewObjectListDeclaration(BspEntity);
+  ObjectListDeclaration(BspEntity);
  public:
   BspEntity(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/camera.cc
===================================================================
--- branches/new_class_id/src/world_entities/camera.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/camera.cc	(revision 9715)
@@ -19,5 +19,5 @@
 #include "glincl.h"
 
-NewObjectListDefinition(Camera);
+ObjectListDefinition(Camera);
 
 /**
@@ -223,5 +223,5 @@
 ///////////////////
 
-NewObjectListDefinition(CameraTarget);
+ObjectListDefinition(CameraTarget);
 CameraTarget::CameraTarget()
 {
Index: branches/new_class_id/src/world_entities/camera.h
===================================================================
--- branches/new_class_id/src/world_entities/camera.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/camera.h	(revision 9715)
@@ -22,5 +22,5 @@
 class Camera : public PNode, public EventListener
 {
-  NewObjectListDeclaration(Camera);
+  ObjectListDeclaration(Camera);
 public:
   //! an enumerator for different types of view
@@ -85,5 +85,5 @@
 {
   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:
Index: branches/new_class_id/src/world_entities/character_attributes.cc
===================================================================
--- branches/new_class_id/src/world_entities/character_attributes.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/character_attributes.cc	(revision 9715)
@@ -20,5 +20,5 @@
 
 
-NewObjectListDefinition(CharacterAttributes);
+ObjectListDefinition(CharacterAttributes);
 
 
Index: branches/new_class_id/src/world_entities/character_attributes.h
===================================================================
--- branches/new_class_id/src/world_entities/character_attributes.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/character_attributes.h	(revision 9715)
@@ -15,5 +15,5 @@
 */
 class CharacterAttributes : public BaseObject {
-    NewObjectListDeclaration(CharacterAttributes);
+    ObjectListDeclaration(CharacterAttributes);
 
  public:
Index: branches/new_class_id/src/world_entities/creatures/fps_player.cc
===================================================================
--- branches/new_class_id/src/world_entities/creatures/fps_player.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/creatures/fps_player.cc	(revision 9715)
@@ -42,5 +42,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
+ObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
 CREATE_FACTORY(FPSPlayer);
 
Index: branches/new_class_id/src/world_entities/creatures/fps_player.h
===================================================================
--- branches/new_class_id/src/world_entities/creatures/fps_player.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/creatures/fps_player.h	(revision 9715)
@@ -16,5 +16,5 @@
 class FPSPlayer : public Playable
 {
-  NewObjectListDeclaration(FPSPlayer);
+  ObjectListDeclaration(FPSPlayer);
 
   public:
Index: branches/new_class_id/src/world_entities/creatures/md2_creature.cc
===================================================================
--- branches/new_class_id/src/world_entities/creatures/md2_creature.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/creatures/md2_creature.cc	(revision 9715)
@@ -38,5 +38,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
+ObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
 CREATE_FACTORY(MD2Creature);
 
Index: branches/new_class_id/src/world_entities/creatures/md2_creature.h
===================================================================
--- branches/new_class_id/src/world_entities/creatures/md2_creature.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/creatures/md2_creature.h	(revision 9715)
@@ -16,5 +16,5 @@
 class MD2Creature : public Playable
 {
-  NewObjectListDeclaration(MD2Creature);
+  ObjectListDeclaration(MD2Creature);
 
   public:
Index: branches/new_class_id/src/world_entities/effects/billboard.cc
===================================================================
--- branches/new_class_id/src/world_entities/effects/billboard.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/effects/billboard.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Billboard, CL_BILLBOARD);
+ObjectListDefinitionID(Billboard, CL_BILLBOARD);
 CREATE_FACTORY(Billboard);
 
Index: branches/new_class_id/src/world_entities/effects/billboard.h
===================================================================
--- branches/new_class_id/src/world_entities/effects/billboard.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/effects/billboard.h	(revision 9715)
@@ -13,5 +13,5 @@
 class Billboard : public WorldEntity
 {
-  NewObjectListDeclaration(Billboard);
+  ObjectListDeclaration(Billboard);
   public:
     Billboard(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/effects/explosion.cc
===================================================================
--- branches/new_class_id/src/world_entities/effects/explosion.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/effects/explosion.cc	(revision 9715)
@@ -28,5 +28,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Explosion, CL_EXPLOSION);
+ObjectListDefinitionID(Explosion, CL_EXPLOSION);
 CREATE_FAST_FACTORY_STATIC(Explosion);
 
Index: branches/new_class_id/src/world_entities/effects/explosion.h
===================================================================
--- branches/new_class_id/src/world_entities/effects/explosion.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/effects/explosion.h	(revision 9715)
@@ -15,5 +15,5 @@
 class Explosion : public WorldEntity
 {
-  NewObjectListDeclaration(Explosion);
+  ObjectListDeclaration(Explosion);
   public:
     static void explode (PNode* position, const Vector& size);
Index: branches/new_class_id/src/world_entities/effects/lightning_bolt.cc
===================================================================
--- branches/new_class_id/src/world_entities/effects/lightning_bolt.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/effects/lightning_bolt.cc	(revision 9715)
@@ -26,5 +26,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(LightningBolt, CL_LIGHTNING_BOLT);
+ObjectListDefinitionID(LightningBolt, CL_LIGHTNING_BOLT);
 CREATE_FACTORY(LightningBolt);
 
Index: branches/new_class_id/src/world_entities/effects/lightning_bolt.h
===================================================================
--- branches/new_class_id/src/world_entities/effects/lightning_bolt.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/effects/lightning_bolt.h	(revision 9715)
@@ -2,8 +2,8 @@
  * @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,5 +21,5 @@
 class LightningBolt : public WorldEntity
 {
-  NewObjectListDeclaration(LightningBolt);
+  ObjectListDeclaration(LightningBolt);
   public:
     LightningBolt(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/elements/image_entity.cc
===================================================================
--- branches/new_class_id/src/world_entities/elements/image_entity.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/elements/image_entity.cc	(revision 9715)
@@ -31,5 +31,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(ImageEntity, CL_IMAGE_ENTITY);
+ObjectListDefinitionID(ImageEntity, CL_IMAGE_ENTITY);
 CREATE_FACTORY(ImageEntity);
 
Index: branches/new_class_id/src/world_entities/elements/image_entity.h
===================================================================
--- branches/new_class_id/src/world_entities/elements/image_entity.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/elements/image_entity.h	(revision 9715)
@@ -21,5 +21,5 @@
 //! A class that enables the
 class ImageEntity : public PNode, public Element2D {
-  NewObjectListDeclaration(ImageEntity);
+  ObjectListDeclaration(ImageEntity);
 
  public:
Index: branches/new_class_id/src/world_entities/elements/text_element.cc
===================================================================
--- branches/new_class_id/src/world_entities/elements/text_element.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/elements/text_element.cc	(revision 9715)
@@ -28,5 +28,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
+ObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
 CREATE_FACTORY(TextElement);
 
Index: branches/new_class_id/src/world_entities/elements/text_element.h
===================================================================
--- branches/new_class_id/src/world_entities/elements/text_element.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/elements/text_element.h	(revision 9715)
@@ -21,5 +21,5 @@
 //! A class that enables the
 class TextElement : public Text {
-  NewObjectListDeclaration(TextElement);
+  ObjectListDeclaration(TextElement);
 
  public:
Index: branches/new_class_id/src/world_entities/environment.cc
===================================================================
--- branches/new_class_id/src/world_entities/environment.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/environment.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Environment, CL_ENVIRONMENT);
+ObjectListDefinitionID(Environment, CL_ENVIRONMENT);
 CREATE_FACTORY(Environment);
 
Index: branches/new_class_id/src/world_entities/environment.h
===================================================================
--- branches/new_class_id/src/world_entities/environment.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/environment.h	(revision 9715)
@@ -16,5 +16,5 @@
 class Environment : public WorldEntity
 {
-  NewObjectListDeclaration(Environment);
+  ObjectListDeclaration(Environment);
 
  public:
Index: branches/new_class_id/src/world_entities/environments/building.cc
===================================================================
--- branches/new_class_id/src/world_entities/environments/building.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/environments/building.cc	(revision 9715)
@@ -24,5 +24,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Building, CL_BUILDING);
+ObjectListDefinitionID(Building, CL_BUILDING);
 CREATE_FACTORY(Building);
 
Index: branches/new_class_id/src/world_entities/environments/building.h
===================================================================
--- branches/new_class_id/src/world_entities/environments/building.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/environments/building.h	(revision 9715)
@@ -15,5 +15,5 @@
 class Building : public WorldEntity
 {
-  NewObjectListDeclaration(Building);
+  ObjectListDeclaration(Building);
   public:
   Building(const TiXmlElement* root);
Index: branches/new_class_id/src/world_entities/environments/mapped_water.cc
===================================================================
--- branches/new_class_id/src/world_entities/environments/mapped_water.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/environments/mapped_water.cc	(revision 9715)
@@ -26,5 +26,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(MappedWater, CL_MAPPED_WATER);
+ObjectListDefinitionID(MappedWater, CL_MAPPED_WATER);
 CREATE_FACTORY(MappedWater);
 
Index: branches/new_class_id/src/world_entities/environments/mapped_water.h
===================================================================
--- branches/new_class_id/src/world_entities/environments/mapped_water.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/environments/mapped_water.h	(revision 9715)
@@ -35,5 +35,5 @@
 class MappedWater : public WorldEntity
 {
-  NewObjectListDeclaration(MappedWater);
+  ObjectListDeclaration(MappedWater);
 public:
   MappedWater(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/environments/model_entity.cc
===================================================================
--- branches/new_class_id/src/world_entities/environments/model_entity.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/environments/model_entity.cc	(revision 9715)
@@ -24,5 +24,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(ModelEntity, CL_MODEL_ENTITY);
+ObjectListDefinitionID(ModelEntity, CL_MODEL_ENTITY);
 CREATE_FACTORY(ModelEntity);
 
Index: branches/new_class_id/src/world_entities/environments/model_entity.h
===================================================================
--- branches/new_class_id/src/world_entities/environments/model_entity.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/environments/model_entity.h	(revision 9715)
@@ -15,5 +15,5 @@
 class ModelEntity : public WorldEntity
 {
-  NewObjectListDeclaration(ModelEntity);
+  ObjectListDeclaration(ModelEntity);
  public:
   ModelEntity(const TiXmlElement* root);
Index: branches/new_class_id/src/world_entities/environments/water.cc
===================================================================
--- branches/new_class_id/src/world_entities/environments/water.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/environments/water.cc	(revision 9715)
@@ -34,5 +34,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Water, CL_WATER);
+ObjectListDefinitionID(Water, CL_WATER);
 CREATE_FACTORY(Water);
 
Index: branches/new_class_id/src/world_entities/environments/water.h
===================================================================
--- branches/new_class_id/src/world_entities/environments/water.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/environments/water.h	(revision 9715)
@@ -22,5 +22,5 @@
 class Water : public WorldEntity
 {
-  NewObjectListDeclaration(Water);
+  ObjectListDeclaration(Water);
   public:
    Water(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/extendable.cc
===================================================================
--- branches/new_class_id/src/world_entities/extendable.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/extendable.cc	(revision 9715)
@@ -1,3 +1,3 @@
 #include "extendable.h"
 
-NewObjectListDefinition(Extendable);
+ObjectListDefinition(Extendable);
Index: branches/new_class_id/src/world_entities/extendable.h
===================================================================
--- branches/new_class_id/src/world_entities/extendable.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/extendable.h	(revision 9715)
@@ -16,5 +16,5 @@
 //! A class for Extendable Entities
 class Extendable : virtual public BaseObject {
-  NewObjectListDeclaration(Extendable);
+  ObjectListDeclaration(Extendable);
 
   public:
Index: branches/new_class_id/src/world_entities/movie_entity.cc
===================================================================
--- branches/new_class_id/src/world_entities/movie_entity.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/movie_entity.cc	(revision 9715)
@@ -22,5 +22,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(MovieEntity, CL_MOVIE_ENTITY);
+ObjectListDefinitionID(MovieEntity, CL_MOVIE_ENTITY);
 CREATE_FACTORY(MovieEntity);
 
Index: branches/new_class_id/src/world_entities/movie_entity.h
===================================================================
--- branches/new_class_id/src/world_entities/movie_entity.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/movie_entity.h	(revision 9715)
@@ -14,5 +14,5 @@
 class MovieEntity : public WorldEntity
 {
-  NewObjectListDeclaration(MovieEntity);
+  ObjectListDeclaration(MovieEntity);
   private:
     MediaContainer* media_container;
Index: branches/new_class_id/src/world_entities/npcs/attractor_mine.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/attractor_mine.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/attractor_mine.cc	(revision 9715)
@@ -34,5 +34,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
+ObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
 CREATE_FACTORY(AttractorMine);
 #include "script_class.h"
Index: branches/new_class_id/src/world_entities/npcs/attractor_mine.h
===================================================================
--- branches/new_class_id/src/world_entities/npcs/attractor_mine.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/attractor_mine.h	(revision 9715)
@@ -9,5 +9,5 @@
 
 class AttractorMine : public NPC {
-  NewObjectListDeclaration(AttractorMine);
+  ObjectListDeclaration(AttractorMine);
 
  public:
Index: branches/new_class_id/src/world_entities/npcs/door.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/door.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/door.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Door, CL_DOOR);
+ObjectListDefinitionID(Door, CL_DOOR);
 CREATE_FACTORY(Door);
 
@@ -159,5 +159,5 @@
   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,5 +173,5 @@
 
 
-  for (NewObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
+  for (ObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
        it != GenericNPC::objectList().end();
        ++it)
Index: branches/new_class_id/src/world_entities/npcs/door.h
===================================================================
--- branches/new_class_id/src/world_entities/npcs/door.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/door.h	(revision 9715)
@@ -21,5 +21,5 @@
 class Door : public WorldEntity
 {
-  NewObjectListDeclaration(Door);
+  ObjectListDeclaration(Door);
 
   public:
Index: branches/new_class_id/src/world_entities/npcs/gate.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/gate.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/gate.cc	(revision 9715)
@@ -32,5 +32,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Gate, CL_GATE);
+ObjectListDefinitionID(Gate, CL_GATE);
 CREATE_FACTORY(Gate);
 
@@ -200,5 +200,5 @@
 
   // 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,5 +212,5 @@
 
 
-  for (NewObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
+  for (ObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
        it != GenericNPC::objectList().end();
        ++it)
Index: branches/new_class_id/src/world_entities/npcs/gate.h
===================================================================
--- branches/new_class_id/src/world_entities/npcs/gate.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/gate.h	(revision 9715)
@@ -22,5 +22,5 @@
 class Gate : public WorldEntity
 {
-  NewObjectListDeclaration(Gate);
+  ObjectListDeclaration(Gate);
 
   public:
Index: branches/new_class_id/src/world_entities/npcs/generic_npc.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/generic_npc.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/generic_npc.cc	(revision 9715)
@@ -33,5 +33,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
+ObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
 CREATE_FACTORY(GenericNPC);
 
Index: branches/new_class_id/src/world_entities/npcs/generic_npc.h
===================================================================
--- branches/new_class_id/src/world_entities/npcs/generic_npc.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/generic_npc.h	(revision 9715)
@@ -25,5 +25,5 @@
 class GenericNPC : public NPC
 {
-  NewObjectListDeclaration(GenericNPC);
+  ObjectListDeclaration(GenericNPC);
 
 
Index: branches/new_class_id/src/world_entities/npcs/ground_turret.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/ground_turret.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/ground_turret.cc	(revision 9715)
@@ -31,5 +31,5 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
+ObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
 CREATE_FACTORY(GroundTurret);
 
Index: branches/new_class_id/src/world_entities/npcs/ground_turret.h
===================================================================
--- branches/new_class_id/src/world_entities/npcs/ground_turret.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/ground_turret.h	(revision 9715)
@@ -14,5 +14,5 @@
 class GroundTurret : public NPC
 {
-  NewObjectListDeclaration(GroundTurret);
+  ObjectListDeclaration(GroundTurret);
 
 public:
Index: branches/new_class_id/src/world_entities/npcs/network_turret.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/network_turret.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/network_turret.cc	(revision 9715)
@@ -32,5 +32,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
+ObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
 CREATE_FACTORY(NetworkTurret);
 
Index: branches/new_class_id/src/world_entities/npcs/network_turret.h
===================================================================
--- branches/new_class_id/src/world_entities/npcs/network_turret.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/network_turret.h	(revision 9715)
@@ -14,5 +14,5 @@
 class NetworkTurret : public NPC
 {
-  NewObjectListDeclaration(NetworkTurret);
+  ObjectListDeclaration(NetworkTurret);
 public:
   NetworkTurret(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/npcs/npc.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/npc.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/npc.cc	(revision 9715)
@@ -20,5 +20,5 @@
 #include "npc.h"
 
-NewObjectListDefinition(NPC);
+ObjectListDefinition(NPC);
 
 NPC::NPC(const TiXmlElement* root)
Index: branches/new_class_id/src/world_entities/npcs/npc.h
===================================================================
--- branches/new_class_id/src/world_entities/npcs/npc.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/npc.h	(revision 9715)
@@ -8,5 +8,5 @@
 
 class NPC : public WorldEntity {
-  NewObjectListDeclaration(NPC);
+  ObjectListDeclaration(NPC);
  public:
    NPC (const TiXmlElement* root);
Index: branches/new_class_id/src/world_entities/npcs/npc_test.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/npc_test.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/npc_test.cc	(revision 9715)
@@ -31,5 +31,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(NPC2, CL_NPC_TEST2);
+ObjectListDefinitionID(NPC2, CL_NPC_TEST2);
 CREATE_FACTORY(NPC2);
 
Index: branches/new_class_id/src/world_entities/npcs/npc_test.h
===================================================================
--- branches/new_class_id/src/world_entities/npcs/npc_test.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/npc_test.h	(revision 9715)
@@ -9,5 +9,5 @@
 
 class NPC2 : public NPC {
-  NewObjectListDeclaration(NPC2);
+  ObjectListDeclaration(NPC2);
 
  public:
Index: branches/new_class_id/src/world_entities/npcs/npc_test1.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/npc_test1.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/npc_test1.cc	(revision 9715)
@@ -25,5 +25,5 @@
 #include "power_ups/laser_power_up.h"
 
-NewObjectListDefinition(NPCTest1);
+ObjectListDefinition(NPCTest1);
 
 NPCTest1::NPCTest1()
Index: branches/new_class_id/src/world_entities/npcs/npc_test1.h
===================================================================
--- branches/new_class_id/src/world_entities/npcs/npc_test1.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/npc_test1.h	(revision 9715)
@@ -8,5 +8,5 @@
 
 class NPCTest1 : public NPC {
-  NewObjectListDeclaration(NPCTest1);
+  ObjectListDeclaration(NPCTest1);
  public:
   NPCTest1 ();
Index: branches/new_class_id/src/world_entities/npcs/repair_station.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/repair_station.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/repair_station.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(RepairStation, CL_DOOR +1 );
+ObjectListDefinitionID(RepairStation, CL_DOOR +1 );
 CREATE_FACTORY(RepairStation);
 
Index: branches/new_class_id/src/world_entities/npcs/repair_station.h
===================================================================
--- branches/new_class_id/src/world_entities/npcs/repair_station.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/repair_station.h	(revision 9715)
@@ -27,5 +27,5 @@
 class RepairStation : public WorldEntity
 {
-  NewObjectListDeclaration(RepairStation);
+  ObjectListDeclaration(RepairStation);
   public:
     RepairStation ();
Index: branches/new_class_id/src/world_entities/npcs/space_turret.cc
===================================================================
--- branches/new_class_id/src/world_entities/npcs/space_turret.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/space_turret.cc	(revision 9715)
@@ -30,5 +30,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
+ObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
 CREATE_FACTORY(SpaceTurret);
 
Index: branches/new_class_id/src/world_entities/npcs/space_turret.h
===================================================================
--- branches/new_class_id/src/world_entities/npcs/space_turret.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/npcs/space_turret.h	(revision 9715)
@@ -18,5 +18,5 @@
 class SpaceTurret : public NPC
 {
-  NewObjectListDeclaration(SpaceTurret);
+  ObjectListDeclaration(SpaceTurret);
 
 public:
Index: branches/new_class_id/src/world_entities/planet.cc
===================================================================
--- branches/new_class_id/src/world_entities/planet.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/planet.cc	(revision 9715)
@@ -33,5 +33,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Planet, CL_PLANET);
+ObjectListDefinitionID(Planet, CL_PLANET);
 CREATE_FACTORY(Planet);
 
Index: branches/new_class_id/src/world_entities/planet.h
===================================================================
--- branches/new_class_id/src/world_entities/planet.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/planet.h	(revision 9715)
@@ -16,5 +16,5 @@
 class Planet : public WorldEntity
 {
-  NewObjectListDeclaration(Planet);
+  ObjectListDeclaration(Planet);
 
  public:
Index: branches/new_class_id/src/world_entities/playable.cc
===================================================================
--- branches/new_class_id/src/world_entities/playable.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/playable.cc	(revision 9715)
@@ -41,5 +41,5 @@
 SHELL_COMMAND_STATIC(orxoWeapon, Playable, Playable::addSomeWeapons_CHEAT)
   ->setAlias("orxoWeapon");
-NewObjectListDefinition(Playable);
+ObjectListDefinition(Playable);
 
 Playable::Playable()
Index: branches/new_class_id/src/world_entities/playable.h
===================================================================
--- branches/new_class_id/src/world_entities/playable.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/playable.h	(revision 9715)
@@ -27,5 +27,5 @@
 class Playable : public WorldEntity, public Extendable
 {
-  NewObjectListDeclaration(Playable);
+  ObjectListDeclaration(Playable);
 public:
   //! Defines the Playmode of an Entity.
Index: branches/new_class_id/src/world_entities/player.cc
===================================================================
--- branches/new_class_id/src/world_entities/player.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/player.cc	(revision 9715)
@@ -24,5 +24,5 @@
 #include "debug.h"
 
-NewObjectListDefinition(Player);
+ObjectListDefinition(Player);
 /**
  * creates a new Player
@@ -101,5 +101,5 @@
 {
   /// 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)
Index: branches/new_class_id/src/world_entities/player.h
===================================================================
--- branches/new_class_id/src/world_entities/player.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/player.h	(revision 9715)
@@ -23,5 +23,5 @@
 class Player : public EventListener
 {
-  NewObjectListDeclaration(Player);
+  ObjectListDeclaration(Player);
 
   public:
Index: branches/new_class_id/src/world_entities/power_ups/laser_power_up.cc
===================================================================
--- branches/new_class_id/src/world_entities/power_ups/laser_power_up.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/power_ups/laser_power_up.cc	(revision 9715)
@@ -25,5 +25,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
+ObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
 CREATE_FACTORY(LaserPowerUp);
 
Index: branches/new_class_id/src/world_entities/power_ups/laser_power_up.h
===================================================================
--- branches/new_class_id/src/world_entities/power_ups/laser_power_up.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/power_ups/laser_power_up.h	(revision 9715)
@@ -13,5 +13,5 @@
 
 class LaserPowerUp : public PowerUp {
-  NewObjectListDeclaration(LaserPowerUp);
+  ObjectListDeclaration(LaserPowerUp);
 
  public:
Index: branches/new_class_id/src/world_entities/power_ups/param_power_up.cc
===================================================================
--- branches/new_class_id/src/world_entities/power_ups/param_power_up.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/power_ups/param_power_up.cc	(revision 9715)
@@ -28,5 +28,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
+ObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
 CREATE_FACTORY(ParamPowerUp);
 
Index: branches/new_class_id/src/world_entities/power_ups/param_power_up.h
===================================================================
--- branches/new_class_id/src/world_entities/power_ups/param_power_up.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/power_ups/param_power_up.h	(revision 9715)
@@ -20,5 +20,5 @@
 
 class ParamPowerUp : public PowerUp {
-  NewObjectListDeclaration(ParamPowerUp);
+  ObjectListDeclaration(ParamPowerUp);
 
 public:
Index: branches/new_class_id/src/world_entities/power_ups/power_up.cc
===================================================================
--- branches/new_class_id/src/world_entities/power_ups/power_up.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/power_ups/power_up.cc	(revision 9715)
@@ -25,5 +25,5 @@
 
 
-NewObjectListDefinition(PowerUp);
+ObjectListDefinition(PowerUp);
 
 PowerUp::PowerUp(float r, float g, float b)
Index: branches/new_class_id/src/world_entities/power_ups/power_up.h
===================================================================
--- branches/new_class_id/src/world_entities/power_ups/power_up.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/power_ups/power_up.h	(revision 9715)
@@ -21,5 +21,5 @@
 
 class PowerUp : public WorldEntity {
-  NewObjectListDeclaration(PowerUp);
+  ObjectListDeclaration(PowerUp);
 
 public:
Index: branches/new_class_id/src/world_entities/power_ups/turret_power_up.cc
===================================================================
--- branches/new_class_id/src/world_entities/power_ups/turret_power_up.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/power_ups/turret_power_up.cc	(revision 9715)
@@ -25,5 +25,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
+ObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
 CREATE_FACTORY(TurretPowerUp);
 
Index: branches/new_class_id/src/world_entities/power_ups/turret_power_up.h
===================================================================
--- branches/new_class_id/src/world_entities/power_ups/turret_power_up.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/power_ups/turret_power_up.h	(revision 9715)
@@ -13,5 +13,5 @@
 
 class TurretPowerUp : public PowerUp {
-  NewObjectListDeclaration(TurretPowerUp);
+  ObjectListDeclaration(TurretPowerUp);
 
  public:
Index: branches/new_class_id/src/world_entities/power_ups/weapon_power_up.cc
===================================================================
--- branches/new_class_id/src/world_entities/power_ups/weapon_power_up.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/power_ups/weapon_power_up.cc	(revision 9715)
@@ -28,5 +28,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
+ObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
 CREATE_FACTORY(WeaponPowerUp);
 
Index: branches/new_class_id/src/world_entities/power_ups/weapon_power_up.h
===================================================================
--- branches/new_class_id/src/world_entities/power_ups/weapon_power_up.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/power_ups/weapon_power_up.h	(revision 9715)
@@ -14,5 +14,5 @@
 
 class WeaponPowerUp : public PowerUp {
-NewObjectListDeclaration(WeaponPowerUp);
+ObjectListDeclaration(WeaponPowerUp);
 public:
   WeaponPowerUp(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/projectiles/bomb.cc
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/bomb.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/bomb.cc	(revision 9715)
@@ -26,5 +26,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Bomb, CL_BOMB);
+ObjectListDefinitionID(Bomb, CL_BOMB);
 CREATE_FAST_FACTORY_STATIC(Bomb);
 
Index: branches/new_class_id/src/world_entities/projectiles/bomb.h
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/bomb.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/bomb.h	(revision 9715)
@@ -17,5 +17,5 @@
 class Bomb : public Projectile
 {
-  NewObjectListDeclaration(Bomb);
+  ObjectListDeclaration(Bomb);
  public:
   Bomb(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/projectiles/boomerang_projectile.cc
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/boomerang_projectile.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/boomerang_projectile.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
+ObjectListDefinitionID(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
 CREATE_FAST_FACTORY_STATIC(BoomerangProjectile);
 
Index: branches/new_class_id/src/world_entities/projectiles/boomerang_projectile.h
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/boomerang_projectile.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/boomerang_projectile.h	(revision 9715)
@@ -17,5 +17,5 @@
 class BoomerangProjectile : public Projectile
 {
-  NewObjectListDeclaration(BoomerangProjectile);
+  ObjectListDeclaration(BoomerangProjectile);
   public:
     BoomerangProjectile ();
Index: branches/new_class_id/src/world_entities/projectiles/guided_missile.cc
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/guided_missile.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/guided_missile.cc	(revision 9715)
@@ -26,5 +26,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(GuidedMissile, CL_GUIDED_MISSILE);
+ObjectListDefinitionID(GuidedMissile, CL_GUIDED_MISSILE);
 CREATE_FAST_FACTORY_STATIC(GuidedMissile);
 
Index: branches/new_class_id/src/world_entities/projectiles/guided_missile.h
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/guided_missile.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/guided_missile.h	(revision 9715)
@@ -16,5 +16,5 @@
 class GuidedMissile : public Projectile
 {
-  NewObjectListDeclaration(GuidedMissile);
+  ObjectListDeclaration(GuidedMissile);
   public:
     GuidedMissile ();
Index: branches/new_class_id/src/world_entities/projectiles/hyperblast.cc
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/hyperblast.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/hyperblast.cc	(revision 9715)
@@ -26,5 +26,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Hyperblast, CL_HYPERBLAST);
+ObjectListDefinitionID(Hyperblast, CL_HYPERBLAST);
 CREATE_FAST_FACTORY_STATIC(Hyperblast);
 
Index: branches/new_class_id/src/world_entities/projectiles/hyperblast.h
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/hyperblast.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/hyperblast.h	(revision 9715)
@@ -17,5 +17,5 @@
 class Hyperblast : public Projectile
 {
-  NewObjectListDeclaration(Hyperblast);
+  ObjectListDeclaration(Hyperblast);
   public:
     Hyperblast ();
Index: branches/new_class_id/src/world_entities/projectiles/laser.cc
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/laser.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/laser.cc	(revision 9715)
@@ -29,5 +29,5 @@
 
 #include "class_id.h"
-NewObjectListDefinition(Laser);
+ObjectListDefinition(Laser);
 CREATE_FAST_FACTORY_STATIC(Laser);
 
Index: branches/new_class_id/src/world_entities/projectiles/laser.h
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/laser.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/laser.h	(revision 9715)
@@ -17,5 +17,5 @@
 class Laser : public Projectile
 {
-  NewObjectListDeclaration(Laser);
+  ObjectListDeclaration(Laser);
   public:
     Laser ();
Index: branches/new_class_id/src/world_entities/projectiles/projectile.cc
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/projectile.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/projectile.cc	(revision 9715)
@@ -26,5 +26,5 @@
 #include "debug.h"
 
-NewObjectListDefinition(Projectile);
+ObjectListDefinition(Projectile);
 
 /**
Index: branches/new_class_id/src/world_entities/projectiles/projectile.h
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/projectile.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/projectile.h	(revision 9715)
@@ -18,5 +18,5 @@
 class Projectile : public WorldEntity
 {
-  NewObjectListDeclaration(Projectile);
+  ObjectListDeclaration(Projectile);
   public:
     Projectile ();
Index: branches/new_class_id/src/world_entities/projectiles/rail_projectile.cc
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/rail_projectile.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/rail_projectile.cc	(revision 9715)
@@ -29,5 +29,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
+ObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
 CREATE_FAST_FACTORY_STATIC(RailProjectile);
 
Index: branches/new_class_id/src/world_entities/projectiles/rail_projectile.h
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/rail_projectile.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/rail_projectile.h	(revision 9715)
@@ -17,5 +17,5 @@
 class RailProjectile : public Projectile
 {
-  NewObjectListDeclaration(RailProjectile);
+  ObjectListDeclaration(RailProjectile);
   public:
     RailProjectile ();
Index: branches/new_class_id/src/world_entities/projectiles/rocket.cc
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/rocket.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/rocket.cc	(revision 9715)
@@ -26,5 +26,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Rocket, CL_ROCKET);
+ObjectListDefinitionID(Rocket, CL_ROCKET);
 CREATE_FAST_FACTORY_STATIC(Rocket);
 
Index: branches/new_class_id/src/world_entities/projectiles/rocket.h
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/rocket.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/rocket.h	(revision 9715)
@@ -15,5 +15,5 @@
 class Rocket : public Projectile
 {
-  NewObjectListDeclaration(Rocket);
+  ObjectListDeclaration(Rocket);
 
 public:
Index: branches/new_class_id/src/world_entities/projectiles/test_bullet.cc
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/test_bullet.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/test_bullet.cc	(revision 9715)
@@ -25,5 +25,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
+ObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
 CREATE_FAST_FACTORY_STATIC(TestBullet);
 
Index: branches/new_class_id/src/world_entities/projectiles/test_bullet.h
===================================================================
--- branches/new_class_id/src/world_entities/projectiles/test_bullet.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/projectiles/test_bullet.h	(revision 9715)
@@ -17,5 +17,5 @@
 class TestBullet : public Projectile
 {
-  NewObjectListDeclaration(TestBullet);
+  ObjectListDeclaration(TestBullet);
 
   public:
Index: branches/new_class_id/src/world_entities/recorder.cc
===================================================================
--- branches/new_class_id/src/world_entities/recorder.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/recorder.cc	(revision 9715)
@@ -23,5 +23,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Recorder, CL_RECORDER);
+ObjectListDefinitionID(Recorder, CL_RECORDER);
 CREATE_FACTORY(Recorder);
 
Index: branches/new_class_id/src/world_entities/recorder.h
===================================================================
--- branches/new_class_id/src/world_entities/recorder.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/recorder.h	(revision 9715)
@@ -20,5 +20,5 @@
 class Recorder : public WorldEntity
 {
-  NewObjectListDeclaration(Recorder);
+  ObjectListDeclaration(Recorder);
   public:
     Recorder (const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/satellite.cc
===================================================================
--- branches/new_class_id/src/world_entities/satellite.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/satellite.cc	(revision 9715)
@@ -25,5 +25,5 @@
 
 
-NewObjectListDefinition(Satellite);
+ObjectListDefinition(Satellite);
 
 /**
Index: branches/new_class_id/src/world_entities/satellite.h
===================================================================
--- branches/new_class_id/src/world_entities/satellite.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/satellite.h	(revision 9715)
@@ -19,5 +19,5 @@
 class Satellite : public WorldEntity
 {
-  NewObjectListDeclaration(Satellite);
+  ObjectListDeclaration(Satellite);
 
  public:
Index: branches/new_class_id/src/world_entities/script_trigger.cc
===================================================================
--- branches/new_class_id/src/world_entities/script_trigger.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/script_trigger.cc	(revision 9715)
@@ -20,5 +20,5 @@
 #include "state.h"
 
-NewObjectListDefinition(ScriptTrigger);
+ObjectListDefinition(ScriptTrigger);
 
 CREATE_SCRIPTABLE_CLASS(ScriptTrigger, ScriptTrigger::classID(),
Index: branches/new_class_id/src/world_entities/script_trigger.h
===================================================================
--- branches/new_class_id/src/world_entities/script_trigger.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/script_trigger.h	(revision 9715)
@@ -18,5 +18,5 @@
 class ScriptTrigger : public WorldEntity
 {
-  NewObjectListDeclaration(ScriptTrigger);
+  ObjectListDeclaration(ScriptTrigger);
   public:
     ScriptTrigger(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/skybox.cc
===================================================================
--- branches/new_class_id/src/world_entities/skybox.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/skybox.cc	(revision 9715)
@@ -32,5 +32,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(SkyBox, CL_SKYBOX);
+ObjectListDefinitionID(SkyBox, CL_SKYBOX);
 CREATE_FACTORY(SkyBox);
 
Index: branches/new_class_id/src/world_entities/skybox.h
===================================================================
--- branches/new_class_id/src/world_entities/skybox.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/skybox.h	(revision 9715)
@@ -27,5 +27,5 @@
 class SkyBox : public WorldEntity
 {
-  NewObjectListDeclaration(SkyBox);
+  ObjectListDeclaration(SkyBox);
 public:
   SkyBox(const std::string& fileName = "");
Index: branches/new_class_id/src/world_entities/skydome.cc
===================================================================
--- branches/new_class_id/src/world_entities/skydome.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/skydome.cc	(revision 9715)
@@ -30,5 +30,5 @@
 
 
-NewObjectListDefinition(Skydome);
+ObjectListDefinition(Skydome);
 
 /**
Index: branches/new_class_id/src/world_entities/skydome.h
===================================================================
--- branches/new_class_id/src/world_entities/skydome.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/skydome.h	(revision 9715)
@@ -21,5 +21,5 @@
 class Skydome : public WorldEntity
 {
-  NewObjectListDeclaration(Skydome);
+  ObjectListDeclaration(Skydome);
 public:
   Skydome();
Index: branches/new_class_id/src/world_entities/skysphere.cc
===================================================================
--- branches/new_class_id/src/world_entities/skysphere.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/skysphere.cc	(revision 9715)
@@ -32,5 +32,5 @@
 
 
-NewObjectListDefinition(Skysphere);
+ObjectListDefinition(Skysphere);
 
 /**
Index: branches/new_class_id/src/world_entities/skysphere.h
===================================================================
--- branches/new_class_id/src/world_entities/skysphere.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/skysphere.h	(revision 9715)
@@ -24,5 +24,5 @@
 class Skysphere : public WorldEntity
 {
-  NewObjectListDeclaration(Skysphere);
+  ObjectListDeclaration(Skysphere);
 
  public:
Index: branches/new_class_id/src/world_entities/space_ships/collision_probe.cc
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/collision_probe.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/collision_probe.cc	(revision 9715)
@@ -25,5 +25,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
+ObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
 
 CREATE_FACTORY(CollisionProbe);
Index: branches/new_class_id/src/world_entities/space_ships/collision_probe.h
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/collision_probe.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/collision_probe.h	(revision 9715)
@@ -13,5 +13,5 @@
 class CollisionProbe : public Playable
 {
-  NewObjectListDeclaration(CollisionProbe);
+  ObjectListDeclaration(CollisionProbe);
 
   public:
Index: branches/new_class_id/src/world_entities/space_ships/cruizer.cc
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/cruizer.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/cruizer.cc	(revision 9715)
@@ -35,5 +35,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Cruizer, CL_CRUIZER);
+ObjectListDefinitionID(Cruizer, CL_CRUIZER);
 CREATE_FACTORY(Cruizer);
 
Index: branches/new_class_id/src/world_entities/space_ships/cruizer.h
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/cruizer.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/cruizer.h	(revision 9715)
@@ -16,5 +16,5 @@
 class Cruizer : public Playable
 {
-  NewObjectListDeclaration(Cruizer);
+  ObjectListDeclaration(Cruizer);
   public:
     Cruizer(const std::string& fileName);
Index: branches/new_class_id/src/world_entities/space_ships/helicopter.cc
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/helicopter.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/helicopter.cc	(revision 9715)
@@ -35,5 +35,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Helicopter, CL_HELICOPTER);
+ObjectListDefinitionID(Helicopter, CL_HELICOPTER);
 CREATE_FACTORY(Helicopter);
 #include "script_class.h"
Index: branches/new_class_id/src/world_entities/space_ships/helicopter.h
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/helicopter.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/helicopter.h	(revision 9715)
@@ -17,5 +17,5 @@
 class Helicopter : public Playable
 {
-  NewObjectListDeclaration(Helicopter);
+  ObjectListDeclaration(Helicopter);
 
   public:
Index: branches/new_class_id/src/world_entities/space_ships/hover.cc
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/hover.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/hover.cc	(revision 9715)
@@ -35,5 +35,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Hover, CL_HOVER);
+ObjectListDefinitionID(Hover, CL_HOVER);
 CREATE_FACTORY(Hover);
 
Index: branches/new_class_id/src/world_entities/space_ships/hover.h
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/hover.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/hover.h	(revision 9715)
@@ -15,5 +15,5 @@
 class Hover : public Playable
 {
-  NewObjectListDeclaration(Hover);
+  ObjectListDeclaration(Hover);
   public:
 
Index: branches/new_class_id/src/world_entities/space_ships/space_ship.cc
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/space_ship.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/space_ship.cc	(revision 9715)
@@ -54,5 +54,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
+ObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
 CREATE_FACTORY(SpaceShip);
 
Index: branches/new_class_id/src/world_entities/space_ships/space_ship.h
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/space_ship.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/space_ship.h	(revision 9715)
@@ -19,5 +19,5 @@
 class SpaceShip : public Playable
 {
-  NewObjectListDeclaration(SpaceShip);
+  ObjectListDeclaration(SpaceShip);
 
   public:
Index: branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.cc
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.cc	(revision 9715)
@@ -39,5 +39,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
+ObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
 CREATE_FACTORY(Spacecraft2D);
 
Index: branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.h
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/spacecraft_2d.h	(revision 9715)
@@ -16,5 +16,5 @@
 class Spacecraft2D : public Playable
 {
-  NewObjectListDeclaration(Spacecraft2D);
+  ObjectListDeclaration(Spacecraft2D);
   public:
     Spacecraft2D(const std::string& fileName);
Index: branches/new_class_id/src/world_entities/space_ships/turbine_hover.cc
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/turbine_hover.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/turbine_hover.cc	(revision 9715)
@@ -35,5 +35,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TurbineHover, CL_TURBINE_HOVER);
+ObjectListDefinitionID(TurbineHover, CL_TURBINE_HOVER);
 CREATE_FACTORY(TurbineHover);
 
Index: branches/new_class_id/src/world_entities/space_ships/turbine_hover.h
===================================================================
--- branches/new_class_id/src/world_entities/space_ships/turbine_hover.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/space_ships/turbine_hover.h	(revision 9715)
@@ -18,5 +18,5 @@
 class TurbineHover : public Playable
 {
-  NewObjectListDeclaration(TurbineHover);
+  ObjectListDeclaration(TurbineHover);
 public:
   TurbineHover(const std::string& fileName);
Index: branches/new_class_id/src/world_entities/spawning_point.cc
===================================================================
--- branches/new_class_id/src/world_entities/spawning_point.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/spawning_point.cc	(revision 9715)
@@ -34,5 +34,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(SpawningPoint, CL_SPAWNING_POINT);
+ObjectListDefinitionID(SpawningPoint, CL_SPAWNING_POINT);
 CREATE_FACTORY( SpawningPoint);
 /**
@@ -109,5 +109,5 @@
   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,5 +160,5 @@
       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,5 +235,5 @@
   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,5 +253,5 @@
   }
 
-  for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
        it != Playable::objectList().end();
        ++it)
Index: branches/new_class_id/src/world_entities/spawning_point.h
===================================================================
--- branches/new_class_id/src/world_entities/spawning_point.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/spawning_point.h	(revision 9715)
@@ -42,5 +42,5 @@
  */
 class SpawningPoint : public WorldEntity {
-  NewObjectListDeclaration(SpawningPoint);
+  ObjectListDeclaration(SpawningPoint);
   public:
     SpawningPoint(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/spectator.cc
===================================================================
--- branches/new_class_id/src/world_entities/spectator.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/spectator.cc	(revision 9715)
@@ -23,5 +23,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Spectator, CL_SPECTATOR);
+ObjectListDefinitionID(Spectator, CL_SPECTATOR);
 CREATE_FACTORY(Spectator);
 
Index: branches/new_class_id/src/world_entities/spectator.h
===================================================================
--- branches/new_class_id/src/world_entities/spectator.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/spectator.h	(revision 9715)
@@ -11,5 +11,5 @@
 class Spectator : public Playable
 {
-  NewObjectListDeclaration(Spectator);
+  ObjectListDeclaration(Spectator);
 
   public:
Index: branches/new_class_id/src/world_entities/terrain.cc
===================================================================
--- branches/new_class_id/src/world_entities/terrain.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/terrain.cc	(revision 9715)
@@ -35,5 +35,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Terrain, CL_TERRAIN);
+ObjectListDefinitionID(Terrain, CL_TERRAIN);
 CREATE_FACTORY(Terrain);
 
Index: branches/new_class_id/src/world_entities/terrain.h
===================================================================
--- branches/new_class_id/src/world_entities/terrain.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/terrain.h	(revision 9715)
@@ -25,5 +25,5 @@
 class Terrain : public WorldEntity
 {
-  NewObjectListDeclaration(Terrain);
+  ObjectListDeclaration(Terrain);
 
  public:
Index: branches/new_class_id/src/world_entities/test_entity.cc
===================================================================
--- branches/new_class_id/src/world_entities/test_entity.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/test_entity.cc	(revision 9715)
@@ -36,5 +36,5 @@
 
 #include "class_id.h"
-NewObjectListDefinition(TestEntity);
+ObjectListDefinition(TestEntity);
 CREATE_FACTORY(TestEntity);
 
Index: branches/new_class_id/src/world_entities/test_entity.h
===================================================================
--- branches/new_class_id/src/world_entities/test_entity.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/test_entity.h	(revision 9715)
@@ -15,5 +15,5 @@
 class TestEntity : public WorldEntity, public PhysicsInterface
 {
-  NewObjectListDeclaration(TestEntity);
+  ObjectListDeclaration(TestEntity);
  public:
   TestEntity ();
Index: branches/new_class_id/src/world_entities/weapons/aim.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/aim.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/aim.cc	(revision 9715)
@@ -29,5 +29,5 @@
 
 
-NewObjectListDefinition(Aim);
+ObjectListDefinition(Aim);
 
 /**
Index: branches/new_class_id/src/world_entities/weapons/aim.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/aim.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/aim.h	(revision 9715)
@@ -29,5 +29,5 @@
 class Aim : public PNode, public Element2D
 {
-  NewObjectListDeclaration(Aim);
+  ObjectListDeclaration(Aim);
 
 public:
Index: branches/new_class_id/src/world_entities/weapons/aiming_system.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/aiming_system.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/aiming_system.cc	(revision 9715)
@@ -30,5 +30,5 @@
 
 
-NewObjectListDefinition(AimingSystem);
+ObjectListDefinition(AimingSystem);
 
 /**
Index: branches/new_class_id/src/world_entities/weapons/aiming_system.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/aiming_system.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/aiming_system.h	(revision 9715)
@@ -21,5 +21,5 @@
 class AimingSystem : public WorldEntity
 {
-  NewObjectListDeclaration(AimingSystem);
+  ObjectListDeclaration(AimingSystem);
 
  public:
Index: branches/new_class_id/src/world_entities/weapons/aiming_turret.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/aiming_turret.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/aiming_turret.cc	(revision 9715)
@@ -28,5 +28,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
+ObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
 CREATE_FACTORY(AimingTurret);
 
Index: branches/new_class_id/src/world_entities/weapons/aiming_turret.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/aiming_turret.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/aiming_turret.h	(revision 9715)
@@ -13,5 +13,5 @@
 class AimingTurret : public Weapon
 {
-  NewObjectListDeclaration(AimingTurret);
+  ObjectListDeclaration(AimingTurret);
 
 public:
Index: branches/new_class_id/src/world_entities/weapons/ammo_container.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/ammo_container.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/ammo_container.cc	(revision 9715)
@@ -23,10 +23,10 @@
 
 
-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);
Index: branches/new_class_id/src/world_entities/weapons/ammo_container.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/ammo_container.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/ammo_container.h	(revision 9715)
@@ -17,12 +17,12 @@
 //! 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,5 +42,5 @@
    float  maxEnergy;
 
-   NewClassID projectileType;
+   ClassID projectileType;
 };
 
Index: branches/new_class_id/src/world_entities/weapons/boomerang_gun.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/boomerang_gun.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/boomerang_gun.cc	(revision 9715)
@@ -28,5 +28,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
+ObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
 CREATE_FACTORY(BoomerangGun);
 
Index: branches/new_class_id/src/world_entities/weapons/boomerang_gun.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/boomerang_gun.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/boomerang_gun.h	(revision 9715)
@@ -11,5 +11,5 @@
 class BoomerangGun : public Weapon
   {
-    NewObjectListDeclaration(BoomerangGun);
+    ObjectListDeclaration(BoomerangGun);
   public:
     BoomerangGun ();
Index: branches/new_class_id/src/world_entities/weapons/cannon.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/cannon.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/cannon.cc	(revision 9715)
@@ -37,5 +37,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Cannon, CL_CANNON);
+ObjectListDefinitionID(Cannon, CL_CANNON);
 CREATE_FACTORY(Cannon);
 
Index: branches/new_class_id/src/world_entities/weapons/cannon.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/cannon.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/cannon.h	(revision 9715)
@@ -12,5 +12,5 @@
 class Cannon : public Weapon
   {
-    NewObjectListDeclaration(Cannon);
+    ObjectListDeclaration(Cannon);
   public:
     Cannon ();
Index: branches/new_class_id/src/world_entities/weapons/crosshair.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/crosshair.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/crosshair.cc	(revision 9715)
@@ -26,5 +26,5 @@
 
 
-NewObjectListDefinition(Crosshair);
+ObjectListDefinition(Crosshair);
 /**
  * standart constructor
Index: branches/new_class_id/src/world_entities/weapons/crosshair.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/crosshair.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/crosshair.h	(revision 9715)
@@ -22,5 +22,5 @@
 //! A class that enables the
 class Crosshair : public PNode, public Element2D, public EventListener {
-  NewObjectListDeclaration(Crosshair);
+  ObjectListDeclaration(Crosshair);
  public:
   Crosshair(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/weapons/fps_sniper_rifle.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/fps_sniper_rifle.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/fps_sniper_rifle.cc	(revision 9715)
@@ -40,5 +40,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
+ObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
 CREATE_FACTORY(FPSSniperRifle);
 
Index: branches/new_class_id/src/world_entities/weapons/fps_sniper_rifle.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/fps_sniper_rifle.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/fps_sniper_rifle.h	(revision 9715)
@@ -39,5 +39,5 @@
 class FPSSniperRifle : public Weapon
   {
-    NewObjectListDeclaration(FPSSniperRifle);
+    ObjectListDeclaration(FPSSniperRifle);
 
   public:
Index: branches/new_class_id/src/world_entities/weapons/hyperblaster.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/hyperblaster.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/hyperblaster.cc	(revision 9715)
@@ -36,5 +36,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
+ObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
 CREATE_FACTORY(Hyperblaster);
 
Index: branches/new_class_id/src/world_entities/weapons/hyperblaster.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/hyperblaster.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/hyperblaster.h	(revision 9715)
@@ -12,5 +12,5 @@
 class Hyperblaster : public Weapon
   {
-    NewObjectListDeclaration(Hyperblaster);
+    ObjectListDeclaration(Hyperblaster);
     public:
     Hyperblaster (const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/weapons/laser_cannon.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/laser_cannon.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/laser_cannon.cc	(revision 9715)
@@ -32,5 +32,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
+ObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
 CREATE_FACTORY(LaserCannon);
 
Index: branches/new_class_id/src/world_entities/weapons/laser_cannon.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/laser_cannon.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/laser_cannon.h	(revision 9715)
@@ -29,5 +29,5 @@
 class LaserCannon : public Weapon
   {
-    NewObjectListDeclaration(LaserCannon);
+    ObjectListDeclaration(LaserCannon);
     public:
     LaserCannon (const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/weapons/targeting_turret.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/targeting_turret.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/targeting_turret.cc	(revision 9715)
@@ -27,5 +27,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
+ObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
 CREATE_FACTORY(TargetingTurret);
 
Index: branches/new_class_id/src/world_entities/weapons/targeting_turret.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/targeting_turret.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/targeting_turret.h	(revision 9715)
@@ -12,5 +12,5 @@
 class TargetingTurret : public Weapon
 {
-  NewObjectListDeclaration(TargetingTurret);
+  ObjectListDeclaration(TargetingTurret);
 public:
   TargetingTurret(const TiXmlElement* root = NULL);
Index: branches/new_class_id/src/world_entities/weapons/test_gun.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/test_gun.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/test_gun.cc	(revision 9715)
@@ -34,5 +34,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(TestGun, CL_TEST_GUN);
+ObjectListDefinitionID(TestGun, CL_TEST_GUN);
 CREATE_FACTORY(TestGun);
 /**
Index: branches/new_class_id/src/world_entities/weapons/test_gun.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/test_gun.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/test_gun.h	(revision 9715)
@@ -37,5 +37,5 @@
 class TestGun : public Weapon
   {
-    NewObjectListDeclaration(TestGun);
+    ObjectListDeclaration(TestGun);
   public:
     TestGun (int leftRight);
Index: branches/new_class_id/src/world_entities/weapons/turret.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/turret.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/turret.cc	(revision 9715)
@@ -28,5 +28,5 @@
 
 #include "class_id.h"
-NewObjectListDefinitionID(Turret, CL_TURRET);
+ObjectListDefinitionID(Turret, CL_TURRET);
 CREATE_FACTORY(Turret);
 
Index: branches/new_class_id/src/world_entities/weapons/turret.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/turret.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/turret.h	(revision 9715)
@@ -11,5 +11,5 @@
 class Turret : public Weapon
   {
-    NewObjectListDeclaration(Turret);
+    ObjectListDeclaration(Turret);
   public:
     Turret ();
Index: branches/new_class_id/src/world_entities/weapons/weapon.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/weapon.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/weapon.cc	(revision 9715)
@@ -35,5 +35,5 @@
 #include "elements/glgui_energywidget.h"
 
-NewObjectListDefinition(Weapon);
+ObjectListDefinition(Weapon);
 
 ////////////////////
@@ -72,5 +72,5 @@
  * @returns the newly created Weapon.
  */
-Weapon* Weapon::createWeapon(const NewClassID& weaponID)
+Weapon* Weapon::createWeapon(const ClassID& weaponID)
 {
   BaseObject* createdObject = Factory::fabricate(weaponID);
@@ -179,5 +179,5 @@
  * 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;
Index: branches/new_class_id/src/world_entities/weapons/weapon.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/weapon.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/weapon.h	(revision 9715)
@@ -83,5 +83,5 @@
 class Weapon : public WorldEntity
 {
-  NewObjectListDeclaration(Weapon);
+  ObjectListDeclaration(Weapon);
 
   public:
@@ -89,5 +89,5 @@
     Weapon ();
     virtual ~Weapon ();
-    static Weapon* createWeapon(const NewClassID& weaponID);
+    static Weapon* createWeapon(const ClassID& weaponID);
     static Weapon* createWeapon(const std::string& weaponName);
 
@@ -113,8 +113,8 @@
     /** @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,5 +233,5 @@
     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.
   };
Index: branches/new_class_id/src/world_entities/weapons/weapon_manager.cc
===================================================================
--- branches/new_class_id/src/world_entities/weapons/weapon_manager.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/weapon_manager.cc	(revision 9715)
@@ -31,5 +31,5 @@
 
 
-NewObjectListDefinition(WeaponManager);
+ObjectListDefinition(WeaponManager);
 /**
  * @brief this initializes the weaponManager for a given nnumber of weapon slots
@@ -311,5 +311,5 @@
  * @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,5 +523,5 @@
 }
 
-CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(const NewClassID& projectileType)
+CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(const ClassID& projectileType)
 {
   for (unsigned int i = 0; i < this->ammo.size(); i++)
Index: branches/new_class_id/src/world_entities/weapons/weapon_manager.h
===================================================================
--- branches/new_class_id/src/world_entities/weapons/weapon_manager.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/weapons/weapon_manager.h	(revision 9715)
@@ -39,5 +39,5 @@
  */
 class WeaponManager : public BaseObject {
-  NewObjectListDeclaration(WeaponManager);
+  ObjectListDeclaration(WeaponManager);
 
   //! an enumerator defining a Slot, where a Weapon can be stored inside.
@@ -90,5 +90,5 @@
     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,5 +107,5 @@
  // 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);
 
Index: branches/new_class_id/src/world_entities/world_entity.cc
===================================================================
--- branches/new_class_id/src/world_entities/world_entity.cc	(revision 9714)
+++ branches/new_class_id/src/world_entities/world_entity.cc	(revision 9715)
@@ -48,5 +48,5 @@
 
 
-NewObjectListDefinition(WorldEntity);
+ObjectListDefinition(WorldEntity);
 /**
  *  Loads the WordEntity-specific Part of any derived Class
@@ -302,5 +302,5 @@
  *  @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,5 +316,5 @@
  *  @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,5 +331,5 @@
  *  @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,5 +347,5 @@
  *  @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);
Index: branches/new_class_id/src/world_entities/world_entity.h
===================================================================
--- branches/new_class_id/src/world_entities/world_entity.h	(revision 9714)
+++ branches/new_class_id/src/world_entities/world_entity.h	(revision 9715)
@@ -41,5 +41,5 @@
 class WorldEntity : public PNode
 {
-  NewObjectListDeclaration(WorldEntity);
+  ObjectListDeclaration(WorldEntity);
 public:
   WorldEntity();
@@ -83,8 +83,8 @@
   /* --- 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);
