Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9715 in orxonox.OLD


Ignore:
Timestamp:
Sep 1, 2006, 8:06:39 PM (18 years ago)
Author:
bensch
Message:

renamed newclassid to classid and newobjectlist to objectlist

Location:
branches/new_class_id/src
Files:
478 edited

Legend:

Unmodified
Added
Removed

  • branches/new_class_id/src/defs/class_id.h

    r9709 r9715  
    6262 *    # max lowerClasses-count      = 3^16 = enough (they are Leaves, and may NOT be derived by any other class.)
    6363 */
    64 typedef enum ClassID
     64typedef enum ClassID_DEPRICATED
    6565{
    6666  // the Nothing CLASS (NULL)

  • branches/new_class_id/src/lib/collision_detection/aabb.cc

    r9687 r9715  
    2121
    2222
    23 NewObjectListDefinition(AABB);
     23ObjectListDefinition(AABB);
    2424/**
    2525 *  standard constructor

  • branches/new_class_id/src/lib/collision_detection/aabb.h

    r9687 r9715  
    1313//! A class representing an extended bounding volume tree: an obb tree
    1414class AABB : public BoundingVolume {
    15   NewObjectListDeclaration(AABB);
     15  ObjectListDeclaration(AABB);
    1616
    1717 public:

  • branches/new_class_id/src/lib/collision_detection/aabb_tree_node.cc

    r9687 r9715  
    3434GLUquadricObj* AABBTreeNode_sphereObj = NULL;
    3535
    36 NewObjectListDefinition(AABBTreeNode);
     36ObjectListDefinition(AABBTreeNode);
    3737/**
    3838 *  standard constructor

  • branches/new_class_id/src/lib/collision_detection/aabb_tree_node.h

    r9687 r9715  
    2121class AABBTreeNode : public BVTreeNode
    2222{
    23   NewObjectListDeclaration(AABBTreeNode);
     23  ObjectListDeclaration(AABBTreeNode);
    2424
    2525

  • branches/new_class_id/src/lib/collision_detection/bounding_sphere.cc

    r9687 r9715  
    2020
    2121
    22 NewObjectListDefinition(BoundingSphere);
     22ObjectListDefinition(BoundingSphere);
    2323/**
    2424 *  standard constructor

  • branches/new_class_id/src/lib/collision_detection/bounding_sphere.h

    r9687 r9715  
    1414//! A class representing an extended bounding volume tree: an sphere
    1515class BoundingSphere : public BoundingVolume {
    16   NewObjectListDeclaration(BoundingSphere);
     16  ObjectListDeclaration(BoundingSphere);
    1717
    1818 public:

  • branches/new_class_id/src/lib/collision_detection/bounding_volume.cc

    r9687 r9715  
    2020
    2121
    22 NewObjectListDefinition(BoundingVolume);
     22ObjectListDefinition(BoundingVolume);
    2323/**
    2424 *  standard constructor

  • branches/new_class_id/src/lib/collision_detection/bounding_volume.h

    r9687 r9715  
    1717//! An abstract class representing a bounding volume
    1818class BoundingVolume : public BaseObject {
    19   NewObjectListDeclaration(BoundingVolume);
     19  ObjectListDeclaration(BoundingVolume);
    2020
    2121  public:

  • branches/new_class_id/src/lib/collision_detection/bv_tree.cc

    r9687 r9715  
    2121
    2222
    23 NewObjectListDefinition(BVTree);
     23ObjectListDefinition(BVTree);
    2424/**
    2525 *  standard constructor

  • branches/new_class_id/src/lib/collision_detection/bv_tree.h

    r9687 r9715  
    3636class BVTree : public BaseObject
    3737{
    38   NewObjectListDeclaration(BVTree);
     38  ObjectListDeclaration(BVTree);
    3939
    4040  public:

  • branches/new_class_id/src/lib/collision_detection/bv_tree_node.cc

    r9687 r9715  
    2020
    2121
    22 NewObjectListDefinition(BVTreeNode);
     22ObjectListDefinition(BVTreeNode);
    2323/**
    2424 *  standard constructor

  • branches/new_class_id/src/lib/collision_detection/bv_tree_node.h

    r9687 r9715  
    2424//! A class that represents a bounding volume tree
    2525class BVTreeNode : public BaseObject {
    26   NewObjectListDeclaration(BVTreeNode);
     26  ObjectListDeclaration(BVTreeNode);
    2727
    2828

  • branches/new_class_id/src/lib/collision_detection/cd_engine.cc

    r9687 r9715  
    3434
    3535
    36 NewObjectListDefinition(CDEngine);
     36ObjectListDefinition(CDEngine);
    3737/**
    3838 * @brief standard constructor
    … …  
    103103  std::list<WorldEntity*>::iterator entityIterator;
    104104  // for all bsp managers check all entities
    105   for( NewObjectList<BspEntity>::const_iterator bspIterator = BspEntity::objectList().begin();
     105  for( ObjectList<BspEntity>::const_iterator bspIterator = BspEntity::objectList().begin();
    106106       bspIterator != BspEntity::objectList().end();
    107107       bspIterator++) {

  • branches/new_class_id/src/lib/collision_detection/cd_engine.h

    r9687 r9715  
    3636//! The class representing the collision detection system of orxonox
    3737class CDEngine : public BaseObject {
    38   NewObjectListDeclaration(CDEngine);
     38  ObjectListDeclaration(CDEngine);
    3939
    4040  friend class WorldEntity;

  • branches/new_class_id/src/lib/collision_detection/obb.cc

    r9687 r9715  
    2121
    2222
    23 NewObjectListDefinition(OBB);
     23ObjectListDefinition(OBB);
    2424/**
    2525 *  standard constructor

  • branches/new_class_id/src/lib/collision_detection/obb.h

    r9687 r9715  
    1515//! A class representing an extended bounding volume tree: an obb tree
    1616class OBB : public BoundingVolume {
    17   NewObjectListDeclaration(OBB);
     17  ObjectListDeclaration(OBB);
    1818
    1919 public:

  • branches/new_class_id/src/lib/collision_detection/obb_tree.cc

    r9687 r9715  
    2727
    2828
    29 NewObjectListDefinition(OBBTree);
     29ObjectListDefinition(OBBTree);
    3030/**
    3131 *  standard constructor

  • branches/new_class_id/src/lib/collision_detection/obb_tree.h

    r9687 r9715  
    2020class OBBTree : public BVTree
    2121{
    22   NewObjectListDeclaration(OBBTree);
     22  ObjectListDeclaration(OBBTree);
    2323
    2424  public:

  • branches/new_class_id/src/lib/collision_detection/obb_tree_node.cc

    r9687 r9715  
    3838GLUquadricObj* OBBTreeNode_sphereObj = NULL;
    3939
    40 NewObjectListDefinition(OBBTreeNode);
     40ObjectListDefinition(OBBTreeNode);
    4141/**
    4242 *  standard constructor

  • branches/new_class_id/src/lib/collision_detection/obb_tree_node.h

    r9687 r9715  
    2020class OBBTreeNode : public BVTreeNode
    2121{
    22   NewObjectListDeclaration(OBBTreeNode);
     22  ObjectListDeclaration(OBBTreeNode);
    2323  public:
    2424    OBBTreeNode(const OBBTree& tree, OBBTreeNode* prev, int depth);

  • branches/new_class_id/src/lib/collision_reaction/collision_handle.cc

    r9688 r9715  
    3030
    3131
    32 NewObjectListDefinition(CollisionHandle);
     32ObjectListDefinition(CollisionHandle);
    3333
    3434/**
    … …  
    9494 *  @param classID the classid to look for
    9595 */
    96 void CollisionHandle::addTarget(const NewClassID& target)
     96void CollisionHandle::addTarget(const ClassID& target)
    9797{
    9898  // make sure there is no dublicate
    99   std::vector<NewClassID>::iterator it = this->targetList.begin();
     99  std::vector<ClassID>::iterator it = this->targetList.begin();
    100100  for( ; it < this->targetList.end(); it++)
    101101    if( (*it) == target)
    … …  
    227227bool CollisionHandle::filterCollisionEvent(CollisionEvent* collisionEvent)
    228228{
    229   std::vector<NewClassID>::iterator it = this->targetList.begin();
     229  std::vector<ClassID>::iterator it = this->targetList.begin();
    230230  for(; it < this->targetList.end(); it++)
    231231  {
    … …  
    276276bool CollisionHandle::filterCollision(Collision* collision)
    277277{
    278   std::vector<NewClassID>::iterator it = this->targetList.begin();
     278  std::vector<ClassID>::iterator it = this->targetList.begin();
    279279  for(; it < this->targetList.end(); it++)
    280280  {

  • branches/new_class_id/src/lib/collision_reaction/collision_handle.h

    r9688 r9715  
    2323class CollisionHandle : public BaseObject
    2424{
    25   NewObjectListDeclaration(CollisionHandle);
     25  ObjectListDeclaration(CollisionHandle);
    2626  public:
    2727    CollisionHandle(WorldEntity* owner, CREngine::CRType type);
    … …  
    3030    void reset();
    3131
    32     void addTarget(const NewClassID& target);
     32    void addTarget(const ClassID& target);
    3333    Collision* registerCollision(WorldEntity* entityA, WorldEntity* entityB);
    3434    void registerSharedCollision(Collision* collision);
    … …  
    6464
    6565    std::vector<Collision*>       collisionList;           //!< a list full of collisions
    66     std::vector<NewClassID>          targetList;              //!< a list of target classes for filtering @TODO TAKE SET INSTEAD OF VECTOR HERE
     66    std::vector<ClassID>          targetList;              //!< a list of target classes for filtering @TODO TAKE SET INSTEAD OF VECTOR HERE
    6767
    6868    CollisionReaction*            collisionReaction;       //!< reference to the collision reaction object

  • branches/new_class_id/src/lib/collision_reaction/collision_reaction.cc

    r9688 r9715  
    2020
    2121
    22 NewObjectListDefinition(CollisionReaction);
     22ObjectListDefinition(CollisionReaction);
    2323
    2424/**

  • branches/new_class_id/src/lib/collision_reaction/collision_reaction.h

    r9688 r9715  
    1818class CollisionReaction : public BaseObject
    1919{
    20   NewObjectListDeclaration(CollisionReaction);
     20  ObjectListDeclaration(CollisionReaction);
    2121  public:
    2222    CollisionReaction();

  • branches/new_class_id/src/lib/collision_reaction/cr_engine.cc

    r9688 r9715  
    2929
    3030
    31 NewObjectListDefinition(CREngine);
     31ObjectListDefinition(CREngine);
    3232/**
    3333 * standard constructor

  • branches/new_class_id/src/lib/collision_reaction/cr_engine.h

    r9688 r9715  
    2525class CREngine : public BaseObject
    2626{
    27   NewObjectListDeclaration(CREngine);
     27  ObjectListDeclaration(CREngine);
    2828
    2929  public:

  • branches/new_class_id/src/lib/collision_reaction/cr_object_damage.cc

    r9688 r9715  
    2828
    2929
    30 NewObjectListDefinition(CRObjectDamage);
     30ObjectListDefinition(CRObjectDamage);
    3131/**
    3232 *  standard constructor

  • branches/new_class_id/src/lib/collision_reaction/cr_object_damage.h

    r9688 r9715  
    1515class CRObjectDamage : public CollisionReaction
    1616{
    17   NewObjectListDeclaration(CRObjectDamage);
     17  ObjectListDeclaration(CRObjectDamage);
    1818  public:
    1919    CRObjectDamage();

  • branches/new_class_id/src/lib/collision_reaction/cr_physics_full_walk.cc

    r9688 r9715  
    3535
    3636
    37 NewObjectListDefinition(CRPhysicsFullWalk);
     37ObjectListDefinition(CRPhysicsFullWalk);
    3838/**
    3939 *  standard constructor

  • branches/new_class_id/src/lib/collision_reaction/cr_physics_full_walk.h

    r9688 r9715  
    1515class CRPhysicsFullWalk : public CollisionReaction
    1616{
    17   NewObjectListDeclaration(CRPhysicsFullWalk);
     17  ObjectListDeclaration(CRPhysicsFullWalk);
    1818  public:
    1919    CRPhysicsFullWalk();

  • branches/new_class_id/src/lib/collision_reaction/cr_physics_ground_walk.cc

    r9688 r9715  
    3535
    3636
    37 NewObjectListDefinition(CRPhysicsGroundWalk);
     37ObjectListDefinition(CRPhysicsGroundWalk);
    3838/**
    3939 *  standard constructor

  • branches/new_class_id/src/lib/collision_reaction/cr_physics_ground_walk.h

    r9688 r9715  
    1515class CRPhysicsGroundWalk : public CollisionReaction
    1616{
    17   NewObjectListDeclaration(CRPhysicsGroundWalk);
     17  ObjectListDeclaration(CRPhysicsGroundWalk);
    1818  public:
    1919    CRPhysicsGroundWalk();

  • branches/new_class_id/src/lib/coord/p_node.cc

    r9709 r9715  
    3030
    3131
    32 NewObjectListDefinition(PNode);
     32ObjectListDefinition(PNode);
    3333/**
    3434 * @brief standard constructor
    … …  
    11071107}
    11081108
    1109 NewObjectListDefinition(NullParent);
     1109ObjectListDefinition(NullParent);
    11101110
    11111111NullParent::NullParent()

  • branches/new_class_id/src/lib/coord/p_node.h

    r9691 r9715  
    7575class PNode : virtual public BaseObject, virtual public Synchronizeable
    7676{
    77   NewObjectListDeclaration(PNode);
     77  ObjectListDeclaration(PNode);
    7878
    7979public:
    … …  
    263263class NullParent : public PNode
    264264{
    265   NewObjectListDeclaration(NullParent);
     265  ObjectListDeclaration(NullParent);
    266266  friend class PNode;
    267267  NullParent();

  • branches/new_class_id/src/lib/event/event_handler.cc

    r9686 r9715  
    2929
    3030
    31 NewObjectListDefinition(EventHandler);
     31ObjectListDefinition(EventHandler);
    3232/**
    3333 * @brief standard constructor

  • branches/new_class_id/src/lib/event/event_handler.h

    r9686 r9715  
    2121class EventHandler : public BaseObject
    2222{
    23   NewObjectListDeclaration(EventHandler);
     23  ObjectListDeclaration(EventHandler);
    2424public:
    2525  virtual ~EventHandler();

  • branches/new_class_id/src/lib/event/event_listener.cc

    r9686 r9715  
    1919#include "event_handler.h"
    2020
    21 NewObjectListDefinition(EventListener);
     21ObjectListDefinition(EventListener);
    2222/**
    2323 * @brief standard constructor

  • branches/new_class_id/src/lib/event/event_listener.h

    r9686 r9715  
    1414class EventListener : virtual public BaseObject
    1515{
    16   NewObjectListDeclaration(EventListener);
     16  ObjectListDeclaration(EventListener);
    1717public:
    1818  EventListener();

  • branches/new_class_id/src/lib/event/key_mapper.cc

    r9686 r9715  
    3232
    3333
    34 NewObjectListDefinition(KeyMapper);
     34ObjectListDefinition(KeyMapper);
    3535
    3636/* initialize all variables to a reasonable value*/

  • branches/new_class_id/src/lib/event/key_mapper.h

    r9686 r9715  
    1616class KeyMapper : public BaseObject
    1717{
    18   NewObjectListDeclaration(KeyMapper);
     18  ObjectListDeclaration(KeyMapper);
    1919public:
    2020  //! A mapping from key-name to key-id

  • branches/new_class_id/src/lib/graphics/effects/atmospheric_engine.cc

    r9694 r9715  
    2323#include "util/loading/factory.h"
    2424
    25 NewObjectListDefinition(AtmosphericEngine);
     25ObjectListDefinition(AtmosphericEngine);
    2626
    2727/**
    … …  
    9494void AtmosphericEngine::draw() const
    9595{
    96   for (NewObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
     96  for (ObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
    9797       it != WeatherEffect::objectList().end();
    9898       ++it)
    … …  
    108108{
    109109
    110   for (NewObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
     110  for (ObjectList<WeatherEffect>::const_iterator it = WeatherEffect::objectList().begin();
    111111       it != WeatherEffect::objectList().end();
    112112       ++it)

  • branches/new_class_id/src/lib/graphics/effects/atmospheric_engine.h

    r9685 r9715  
    1414class AtmosphericEngine : public BaseObject
    1515{
    16   NewObjectListDeclaration(AtmosphericEngine);
     16  ObjectListDeclaration(AtmosphericEngine);
    1717  public:
    1818    ~AtmosphericEngine();

  • branches/new_class_id/src/lib/graphics/effects/cloud_effect.cc

    r9709 r9715  
    4040float     CloudEffect::fadeTime;
    4141
    42 NewObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
     42ObjectListDefinitionID(CloudEffect, CL_CLOUD_EFFECT);
    4343
    4444

  • branches/new_class_id/src/lib/graphics/effects/cloud_effect.h

    r9686 r9715  
    3737
    3838class CloudEffect : public WeatherEffect {
    39   NewObjectListDeclaration(CloudEffect);
     39  ObjectListDeclaration(CloudEffect);
    4040
    4141public:

  • branches/new_class_id/src/lib/graphics/effects/fog_effect.cc

    r9709 r9715  
    2222#include "cloud_effect.h"
    2323
    24 NewObjectListDefinition(FogEffect);
     24ObjectListDefinition(FogEffect);
    2525// Define shell commands
    2626//SHELL_COMMAND(activate, FogEffect, activateFog);

  • branches/new_class_id/src/lib/graphics/effects/fog_effect.h

    r9686 r9715  
    1515class FogEffect : public WeatherEffect
    1616{
    17   NewObjectListDeclaration(FogEffect);
     17  ObjectListDeclaration(FogEffect);
    1818public:
    1919  FogEffect(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/lib/graphics/effects/graphics_effect.cc

    r9685 r9715  
    2222#include "util/loading/load_param.h"
    2323
    24 NewObjectListDefinition(GraphicsEffect);
     24ObjectListDefinition(GraphicsEffect);
    2525
    2626/**

  • branches/new_class_id/src/lib/graphics/effects/graphics_effect.h

    r9685 r9715  
    1313//! A class that handles GraphicsEffects. The GraphicsEffectManager operates on this.
    1414class GraphicsEffect : public BaseObject {
    15   NewObjectListDeclaration(GraphicsEffect);
     15  ObjectListDeclaration(GraphicsEffect);
    1616  public:
    1717    GraphicsEffect(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/lib/graphics/effects/lense_flare.cc

    r9709 r9715  
    3535#include "class_id.h"
    3636
    37 NewObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);
     37ObjectListDefinitionID(LenseFlare, CL_LENSE_FLARE);
    3838CREATE_FACTORY(LenseFlare);
    3939

  • branches/new_class_id/src/lib/graphics/effects/lense_flare.h

    r9686 r9715  
    2626class LenseFlare : public GraphicsEffect
    2727{
    28   NewObjectListDeclaration(LenseFlare);
     28  ObjectListDeclaration(LenseFlare);
    2929  public:
    3030    LenseFlare(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/lib/graphics/effects/lightning_effect.cc

    r9709 r9715  
    2929#include "class_id.h"
    3030
    31 NewObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
     31ObjectListDefinitionID(LightningEffect, CL_LIGHTNING_EFFECT);
    3232
    3333SHELL_COMMAND(activate, LightningEffect, activateLightning);

  • branches/new_class_id/src/lib/graphics/effects/lightning_effect.h

    r9686 r9715  
    1919class LightningEffect : public WeatherEffect
    2020{
    21   NewObjectListDeclaration(LightningEffect);
     21  ObjectListDeclaration(LightningEffect);
    2222public:
    2323  LightningEffect(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/lib/graphics/effects/rain_effect.cc

    r9709 r9715  
    3333#include "class_id.h"
    3434
    35 NewObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
     35ObjectListDefinitionID(RainEffect, CL_RAIN_EFFECT);
    3636
    3737// Define shell commands

  • branches/new_class_id/src/lib/graphics/effects/rain_effect.h

    r9686 r9715  
    2525class RainEffect : public WeatherEffect
    2626{
    27   NewObjectListDeclaration(RainEffect);
     27  ObjectListDeclaration(RainEffect);
    2828public:
    2929  RainEffect(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/lib/graphics/effects/snow_effect.cc

    r9709 r9715  
    3232#include "class_id.h"
    3333
    34 NewObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
     34ObjectListDefinitionID(SnowEffect, CL_SNOW_EFFECT);
    3535SHELL_COMMAND(activate, SnowEffect, activateSnow);
    3636SHELL_COMMAND(deactivate, SnowEffect, deactivateSnow);

  • branches/new_class_id/src/lib/graphics/effects/snow_effect.h

    r9686 r9715  
    2323class SnowEffect : public WeatherEffect
    2424{
    25   NewObjectListDeclaration(SnowEffect);
     25  ObjectListDeclaration(SnowEffect);
    2626public:
    2727  SnowEffect(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/lib/graphics/effects/volfog_effect.cc

    r9709 r9715  
    4848
    4949#include "class_id.h"
    50 NewObjectListDefinitionID(VolFogEffect, CL_VOLFOG_EFFECT);
     50ObjectListDefinitionID(VolFogEffect, CL_VOLFOG_EFFECT);
    5151CREATE_FACTORY(VolFogEffect);
    5252

  • branches/new_class_id/src/lib/graphics/effects/volfog_effect.h

    r9686 r9715  
    1313class VolFogEffect : public WeatherEffect
    1414{
    15   NewObjectListDeclaration(VolFogEffect);
     15  ObjectListDeclaration(VolFogEffect);
    1616public:
    1717  VolFogEffect(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/lib/graphics/effects/weather_effect.cc

    r9685 r9715  
    2020#include "util/loading/load_param.h"
    2121
    22 NewObjectListDefinition(WeatherEffect);
     22ObjectListDefinition(WeatherEffect);
    2323
    2424/**

  • branches/new_class_id/src/lib/graphics/effects/weather_effect.h

    r9685 r9715  
    1212class WeatherEffect : public BaseObject
    1313{
    14   NewObjectListDeclaration(WeatherEffect);
     14  ObjectListDeclaration(WeatherEffect);
    1515
    1616  public:

  • branches/new_class_id/src/lib/graphics/graphics_engine.cc

    r9685 r9715  
    5353SHELL_COMMAND(fps, GraphicsEngine, toggleFPSdisplay);
    5454
    55 NewObjectListDefinition(GraphicsEngine);
     55ObjectListDefinition(GraphicsEngine);
    5656
    5757/**
    … …  
    591591
    592592  // tick the graphics effects
    593   for (NewObjectList<GraphicsEffect>::const_iterator it = GraphicsEffect::objectList().begin();
     593  for (ObjectList<GraphicsEffect>::const_iterator it = GraphicsEffect::objectList().begin();
    594594       it != GraphicsEffect::objectList().end();
    595595       ++it)

  • branches/new_class_id/src/lib/graphics/graphics_engine.h

    r9685 r9715  
    3030class GraphicsEngine : public EventListener
    3131{
    32   NewObjectListDeclaration(GraphicsEngine);
     32  ObjectListDeclaration(GraphicsEngine);
    3333  public:
    3434    virtual ~GraphicsEngine();

  • branches/new_class_id/src/lib/graphics/importer/height_map.cc

    r9684 r9715  
    327327
    328328
    329 NewObjectListDefinition(HeightMap);
     329ObjectListDefinition(HeightMap);
    330330
    331331

  • branches/new_class_id/src/lib/graphics/importer/height_map.h

    r9684 r9715  
    7272class HeightMap : public VertexArrayModel
    7373{
    74   NewObjectListDeclaration(HeightMap);
     74  ObjectListDeclaration(HeightMap);
    7575  friend class Tile;
    7676

  • branches/new_class_id/src/lib/graphics/importer/interactive_model.cc

    r9684 r9715  
    2222
    2323
    24 NewObjectListDefinition(InteractiveModel);
     24ObjectListDefinition(InteractiveModel);
    2525
    2626/**

  • branches/new_class_id/src/lib/graphics/importer/interactive_model.h

    r9684 r9715  
    3030class InteractiveModel : public Model
    3131{
    32   NewObjectListDeclaration(InteractiveModel);
     32  ObjectListDeclaration(InteractiveModel);
    3333  public:
    3434    InteractiveModel();

  • branches/new_class_id/src/lib/graphics/importer/material.cc

    r9685 r9715  
    2727#include "util/loading/resource_manager.h"
    2828
    29 NewObjectListDefinition(Material);
     29ObjectListDefinition(Material);
    3030
    3131/**

  • branches/new_class_id/src/lib/graphics/importer/material.h

    r9685 r9715  
    2424class Material : public BaseObject
    2525{
    26   NewObjectListDeclaration(Material);
     26  ObjectListDeclaration(Material);
    2727public:
    2828  Material (const std::string& mtlName = "");

  • branches/new_class_id/src/lib/graphics/importer/md2/md2Model.cc

    r9685 r9715  
    2222
    2323
    24 NewObjectListDefinition(MD2Model);
     24ObjectListDefinition(MD2Model);
    2525
    2626//! the model anorms

  • branches/new_class_id/src/lib/graphics/importer/md2/md2Model.h

    r9685 r9715  
    149149//! This is a MD2 Model class
    150150class MD2Model : public InteractiveModel {
    151   NewObjectListDeclaration(MD2Model);
     151  ObjectListDeclaration(MD2Model);
    152152public:
    153153  MD2Model(const std::string& modelFileName, const std::string& skinFileName = "", float scale = 1.0f);

  • branches/new_class_id/src/lib/graphics/importer/media_container.cc

    r9685 r9715  
    3030#include "debug.h"
    3131
    32 NewObjectListDefinition(MediaContainer);
     32ObjectListDefinition(MediaContainer);
    3333
    3434/**

  • branches/new_class_id/src/lib/graphics/importer/media_container.h

    r9685 r9715  
    2424class MediaContainer : public TextureSequence
    2525{
    26   NewObjectListDeclaration(MediaContainer);
     26  ObjectListDeclaration(MediaContainer);
    2727private:
    2828

  • branches/new_class_id/src/lib/graphics/importer/model.cc

    r9684 r9715  
    2020#include "glincl.h"
    2121
    22 NewObjectListDefinition(Model);
     22ObjectListDefinition(Model);
    2323
    2424/**

  • branches/new_class_id/src/lib/graphics/importer/model.h

    r9684 r9715  
    5454//! This class defines the basic components of a model
    5555class Model : virtual public BaseObject {
    56   NewObjectListDeclaration(Model);
     56  ObjectListDeclaration(Model);
    5757
    5858  public:

  • branches/new_class_id/src/lib/graphics/importer/movie_player.cc

    r9685 r9715  
    3030#include "debug.h"
    3131
    32 NewObjectListDefinition(MoviePlayer);
     32ObjectListDefinition(MoviePlayer);
    3333
    3434MoviePlayer::MoviePlayer(const std::string& filename)

  • branches/new_class_id/src/lib/graphics/importer/movie_player.h

    r9685 r9715  
    3131class MoviePlayer : public BaseObject
    3232{
    33   NewObjectListDeclaration(MoviePlayer);
     33  ObjectListDeclaration(MoviePlayer);
    3434
    3535private:

  • branches/new_class_id/src/lib/graphics/importer/objModel.cc

    r9684 r9715  
    2727#include "compiler.h"
    2828
    29 NewObjectListDefinition(OBJModel);
     29ObjectListDefinition(OBJModel);
    3030/**
    3131 * @brief Crates a 3D-Model, loads in a File and scales it.

  • branches/new_class_id/src/lib/graphics/importer/objModel.h

    r9684 r9715  
    1212class OBJModel : public StaticModel
    1313{
    14   NewObjectListDeclaration(OBJModel);
     14  ObjectListDeclaration(OBJModel);
    1515  public:
    1616   OBJModel(const std::string& fileName, float scaling = 1.0);

  • branches/new_class_id/src/lib/graphics/importer/static_model.cc

    r9684 r9715  
    134134/// MODEL ///
    135135/////////////
    136 NewObjectListDefinition(StaticModel);
     136ObjectListDefinition(StaticModel);
    137137
    138138/**

  • branches/new_class_id/src/lib/graphics/importer/static_model.h

    r9684 r9715  
    9494class StaticModel : public Model
    9595{
    96   NewObjectListDeclaration(StaticModel);
     96  ObjectListDeclaration(StaticModel);
    9797  public:
    9898  StaticModel(const std::string& modelName = "");

  • branches/new_class_id/src/lib/graphics/importer/texture.cc

    r9685 r9715  
    6464#endif
    6565
    66 NewObjectListDefinition(Texture);
     66ObjectListDefinition(Texture);
    6767
    6868/**

  • branches/new_class_id/src/lib/graphics/importer/texture.h

    r9685 r9715  
    2020class Texture : public BaseObject
    2121{
    22   NewObjectListDeclaration(Texture);
     22  ObjectListDeclaration(Texture);
    2323public:
    2424  Texture();

  • branches/new_class_id/src/lib/graphics/importer/texture_sequence.cc

    r9685 r9715  
    2828#endif
    2929
    30 NewObjectListDefinition(TextureSequence);
     30ObjectListDefinition(TextureSequence);
    3131
    3232/**

  • branches/new_class_id/src/lib/graphics/importer/texture_sequence.h

    r9685 r9715  
    1515class TextureSequence : public Texture
    1616{
    17   NewObjectListDeclaration(TextureSequence);
     17  ObjectListDeclaration(TextureSequence);
    1818  public:
    1919    TextureSequence(unsigned int count = 0, ...);

  • branches/new_class_id/src/lib/graphics/importer/vertex_array_model.cc

    r9684 r9715  
    2424
    2525
    26 NewObjectListDefinition(VertexArrayModel);
     26ObjectListDefinition(VertexArrayModel);
    2727
    2828/////////////

  • branches/new_class_id/src/lib/graphics/importer/vertex_array_model.h

    r9684 r9715  
    2727class VertexArrayModel : public Model
    2828{
    29   NewObjectListDeclaration(VertexArrayModel);
     29  ObjectListDeclaration(VertexArrayModel);
    3030  public:
    3131  VertexArrayModel();

  • branches/new_class_id/src/lib/graphics/light.cc

    r9709 r9715  
    2929#include "class_id.h"
    3030
    31 NewObjectListDefinitionID(Light, CL_LIGHT);
     31ObjectListDefinitionID(Light, CL_LIGHT);
    3232CREATE_FACTORY(Light);
    3333
    … …  
    215215** LIGHT-MANAGER **
    216216******************/
    217 NewObjectListDefinition(LightManager);
     217ObjectListDefinition(LightManager);
    218218/**
    219219 *  standard constructor for a Light

  • branches/new_class_id/src/lib/graphics/light.h

    r9685 r9715  
    2525class Light : public PNode
    2626{
    27   NewObjectListDeclaration(Light);
     27  ObjectListDeclaration(Light);
    2828public:
    2929  Light(const TiXmlElement* root = NULL);
    … …  
    8989class LightManager : public BaseObject
    9090{
    91   NewObjectListDeclaration(LightManager);
     91  ObjectListDeclaration(LightManager);
    9292
    9393  friend class Light;

  • branches/new_class_id/src/lib/graphics/render2D/element_2d.cc

    r9685 r9715  
    3535SHELL_COMMAND(debug, Element2D, debug2D);
    3636
    37 NewObjectListDefinition(Element2D);
     37ObjectListDefinition(Element2D);
    3838
    3939

  • branches/new_class_id/src/lib/graphics/render2D/element_2d.h

    r9685 r9715  
    8989class Element2D : virtual public BaseObject
    9090{
    91   NewObjectListDeclaration(Element2D);
     91  ObjectListDeclaration(Element2D);
    9292
    9393public:

  • branches/new_class_id/src/lib/graphics/render2D/image_plane.cc

    r9709 r9715  
    2626#include "class_id.h"
    2727
    28 NewObjectListDefinitionID(ImagePlane, CL_IMAGE_PLANE);
     28ObjectListDefinitionID(ImagePlane, CL_IMAGE_PLANE);
    2929CREATE_FACTORY(ImagePlane);
    3030

  • branches/new_class_id/src/lib/graphics/render2D/image_plane.h

    r9685 r9715  
    1717class ImagePlane :  public Element2D
    1818{
    19   NewObjectListDeclaration(ImagePlane);
     19  ObjectListDeclaration(ImagePlane);
    2020  public:
    2121    ImagePlane(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/lib/graphics/render2D/render_2d.cc

    r9685 r9715  
    2121#include "element_2d.h"
    2222
    23 NewObjectListDefinition(Render2D);
     23ObjectListDefinition(Render2D);
    2424
    2525

  • branches/new_class_id/src/lib/graphics/render2D/render_2d.h

    r9685 r9715  
    1414class Render2D : public BaseObject
    1515{
    16   NewObjectListDeclaration(Render2D);
     16  ObjectListDeclaration(Render2D);
    1717
    1818  friend class Element2D;

  • branches/new_class_id/src/lib/graphics/shader.cc

    r9685 r9715  
    3333
    3434
    35 NewObjectListDefinition(Shader);
     35ObjectListDefinition(Shader);
    3636
    3737/**

  • branches/new_class_id/src/lib/graphics/shader.h

    r9685 r9715  
    1919class Shader : public BaseObject
    2020{
    21   NewObjectListDeclaration(Shader);
     21  ObjectListDeclaration(Shader);
    2222public:
    2323  class Uniform

  • branches/new_class_id/src/lib/graphics/spatial_separation/quadtree.cc

    r9685 r9715  
    2727#define QUADTREE_MATERIAL_COUNT       4
    2828
    29 NewObjectListDefinition(Quadtree);
     29ObjectListDefinition(Quadtree);
    3030/**
    3131 *  standard constructor

  • branches/new_class_id/src/lib/graphics/spatial_separation/quadtree.h

    r9685 r9715  
    2121//! A class for quadtree separation of the world
    2222class Quadtree : public BaseObject {
    23   NewObjectListDeclaration(Quadtree);
     23  ObjectListDeclaration(Quadtree);
    2424
    2525  public:

  • branches/new_class_id/src/lib/graphics/spatial_separation/quadtree_node.cc

    r9685 r9715  
    2727
    2828
    29 NewObjectListDefinition(QuadtreeNode);
     29ObjectListDefinition(QuadtreeNode);
    3030
    3131/**

  • branches/new_class_id/src/lib/graphics/spatial_separation/quadtree_node.h

    r9685 r9715  
    2626//! A class for a Quadtree Node representation
    2727class QuadtreeNode : public BaseObject {
    28   NewObjectListDeclaration(QuadtreeNode);
     28  ObjectListDeclaration(QuadtreeNode);
    2929
    3030  public:

  • branches/new_class_id/src/lib/graphics/spatial_separation/spatial_separation.cc

    r9685 r9715  
    2424
    2525
    26 NewObjectListDefinition(SpatialSeparation);
     26ObjectListDefinition(SpatialSeparation);
    2727
    2828/**

  • branches/new_class_id/src/lib/graphics/spatial_separation/spatial_separation.h

    r9685 r9715  
    1919//! A class for spatial separation of vertices based arrays
    2020class SpatialSeparation : public BaseObject {
    21   NewObjectListDeclaration(SpatialSeparation);
     21  ObjectListDeclaration(SpatialSeparation);
    2222
    2323  public:

  • branches/new_class_id/src/lib/graphics/text_engine/font.cc

    r9685 r9715  
    2929#include "compiler.h"
    3030
    31 NewObjectListDefinition(Font);
     31ObjectListDefinition(Font);
    3232
    3333Font::Font()

  • branches/new_class_id/src/lib/graphics/text_engine/font.h

    r9685 r9715  
    1919class Font : public Material
    2020{
    21   NewObjectListDeclaration(Font);
     21  ObjectListDeclaration(Font);
    2222
    2323public:

  • branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.cc

    r9685 r9715  
    1919#include "font.h"
    2020
    21 NewObjectListDefinition(LimitedWidthText);
     21ObjectListDefinition(LimitedWidthText);
    2222/**
    2323 * @brief creates a new Text Element

  • branches/new_class_id/src/lib/graphics/text_engine/limited_width_text.h

    r9685 r9715  
    1414class LimitedWidthText : public Text
    1515{
    16   NewObjectListDeclaration(LimitedWidthText);
     16  ObjectListDeclaration(LimitedWidthText);
    1717  public:
    1818    typedef enum {

  • branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.cc

    r9685 r9715  
    1919#include "font.h"
    2020
    21 NewObjectListDefinition(MultiLineText);
     21ObjectListDefinition(MultiLineText);
    2222
    2323/**

  • branches/new_class_id/src/lib/graphics/text_engine/multi_line_text.h

    r9685 r9715  
    1414class MultiLineText : public Text
    1515{
    16   NewObjectListDeclaration(MultiLineText);
     16  ObjectListDeclaration(MultiLineText);
    1717  public:
    1818    MultiLineText(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE, float lineWidth = 100.0);

  • branches/new_class_id/src/lib/graphics/text_engine/text.cc

    r9685 r9715  
    2222#include "debug.h"
    2323
    24 NewObjectListDefinition(Text);
     24ObjectListDefinition(Text);
    2525
    2626/**

  • branches/new_class_id/src/lib/graphics/text_engine/text.h

    r9685 r9715  
    2626class Text : public Element2D
    2727{
    28   NewObjectListDeclaration(Text);
     28  ObjectListDeclaration(Text);
    2929  public:
    3030    Text(const std::string& fontFile = "", unsigned int fontSize = TEXT_DEFAULT_SIZE);

  • branches/new_class_id/src/lib/graphics/text_engine/text_engine.cc

    r9685 r9715  
    3939/// TEXT-ENGINE ///
    4040///////////////////
    41 NewObjectListDefinition(TextEngine);
     41ObjectListDefinition(TextEngine);
    4242/**
    4343 *  standard constructor
    … …  
    124124  PRINT(0)("Reference: %p; Text Counts: %d\n", this, Text::objectList().size());
    125125
    126   for (NewObjectList<Text>::const_iterator it = Text::objectList().begin();
     126  for (ObjectList<Text>::const_iterator it = Text::objectList().begin();
    127127       it != Text::objectList().end();
    128128       ++it)

  • branches/new_class_id/src/lib/graphics/text_engine/text_engine.h

    r9685 r9715  
    2424class TextEngine : public BaseObject
    2525{
    26   NewObjectListDeclaration(TextEngine);
     26  ObjectListDeclaration(TextEngine);
    2727  public:
    2828  virtual ~TextEngine();

  • branches/new_class_id/src/lib/gui/gl/glgui_bar.cc

    r9689 r9715  
    2323{
    2424
    25   NewObjectListDefinition(GLGuiBar);
     25  ObjectListDefinition(GLGuiBar);
    2626  /**
    2727   * @brief standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_bar.h

    r9689 r9715  
    2121  class GLGuiBar : public GLGuiWidget
    2222  {
    23     NewObjectListDeclaration(GLGuiBar);
     23    ObjectListDeclaration(GLGuiBar);
    2424  public:
    2525    GLGuiBar();

  • branches/new_class_id/src/lib/gui/gl/glgui_box.cc

    r9689 r9715  
    2222namespace OrxGui
    2323{
    24   NewObjectListDefinition(GLGuiBox);
     24  ObjectListDefinition(GLGuiBox);
    2525  /**
    2626   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_box.h

    r9689 r9715  
    1919  class GLGuiBox : public GLGuiContainer
    2020  {
    21     NewObjectListDeclaration(GLGuiBox);
     21    ObjectListDeclaration(GLGuiBox);
    2222  public:
    2323    GLGuiBox(OrxGui::Orientation orientation = OrxGui::Vertical);

  • branches/new_class_id/src/lib/gui/gl/glgui_button.cc

    r9689 r9715  
    2323namespace OrxGui
    2424{
    25   NewObjectListDefinition(GLGuiButton);
     25  ObjectListDefinition(GLGuiButton);
    2626  /**
    2727   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_button.h

    r9689 r9715  
    3131  class GLGuiButton : public GLGuiWidget
    3232  {
    33     NewObjectListDeclaration(GLGuiButton);
     33    ObjectListDeclaration(GLGuiButton);
    3434    public:
    3535      GLGuiButton(const std::string& label);

  • branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.cc

    r9689 r9715  
    2222namespace OrxGui
    2323{
    24   NewObjectListDefinition(GLGuiCheckButton);
     24  ObjectListDefinition(GLGuiCheckButton);
    2525
    2626  /**

  • branches/new_class_id/src/lib/gui/gl/glgui_checkbutton.h

    r9689 r9715  
    2121  class GLGuiCheckButton : public GLGuiButton
    2222  {
    23     NewObjectListDeclaration(GLGuiCheckButton);
     23    ObjectListDeclaration(GLGuiCheckButton);
    2424  public:
    2525    GLGuiCheckButton(const std::string& label = "", bool active = false);

  • branches/new_class_id/src/lib/gui/gl/glgui_colorselector.h

    r9689 r9715  
    2121  class GLGui : public GLGui
    2222  {
    23     NewObjectListDeclaration(GLGuiColorSelector);
     23    ObjectListDeclaration(GLGuiColorSelector);
    2424  public:
    2525    GLGui();

  • branches/new_class_id/src/lib/gui/gl/glgui_container.cc

    r9689 r9715  
    2020namespace OrxGui
    2121{
    22   NewObjectListDefinition(GLGuiContainer);
     22  ObjectListDefinition(GLGuiContainer);
    2323  /**
    2424   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_container.h

    r9689 r9715  
    2020  class GLGuiContainer : public GLGuiWidget
    2121  {
    22     NewObjectListDeclaration(GLGuiContainer);
     22    ObjectListDeclaration(GLGuiContainer);
    2323  public:
    2424    GLGuiContainer();

  • branches/new_class_id/src/lib/gui/gl/glgui_cursor.cc

    r9689 r9715  
    2323namespace OrxGui
    2424{
    25   NewObjectListDefinition(GLGuiCursor);
     25  ObjectListDefinition(GLGuiCursor);
    2626  /**
    2727   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_cursor.h

    r9689 r9715  
    2626  class GLGuiCursor : public GLGuiWidget, public EventListener
    2727  {
    28     NewObjectListDeclaration(GLGuiCursor);
     28    ObjectListDeclaration(GLGuiCursor);
    2929  public:
    3030    GLGuiCursor();

  • branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.cc

    r9689 r9715  
    2323namespace OrxGui
    2424{
    25   NewObjectListDefinition(GLGuiFixedpositionBox);
     25  ObjectListDefinition(GLGuiFixedpositionBox);
    2626  /**
    2727   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_fixedposition_box.h

    r9689 r9715  
    2121  class GLGuiFixedpositionBox : public OrxGui::GLGuiBox, EventListener
    2222  {
    23     NewObjectListDeclaration(GLGuiFixedpositionBox);
     23    ObjectListDeclaration(GLGuiFixedpositionBox);
    2424    public:
    2525      GLGuiFixedpositionBox(OrxGui::Position position = OrxGui::Center, OrxGui::Orientation orientation = OrxGui::Vertical);

  • branches/new_class_id/src/lib/gui/gl/glgui_frame.cc

    r9689 r9715  
    2121namespace OrxGui
    2222{
    23   NewObjectListDefinition(GLGuiFrame);
     23  ObjectListDefinition(GLGuiFrame);
    2424  /**
    2525   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_frame.h

    r9689 r9715  
    2020  class GLGuiFrame : public GLGuiContainer
    2121  {
    22     NewObjectListDeclaration(GLGuiFrame);
     22    ObjectListDeclaration(GLGuiFrame);
    2323  public:
    2424    GLGuiFrame();

  • branches/new_class_id/src/lib/gui/gl/glgui_handler.cc

    r9689 r9715  
    3434namespace OrxGui
    3535{
    36   NewObjectListDefinition(GLGuiHandler);
     36  ObjectListDefinition(GLGuiHandler);
    3737  /**
    3838   * standard constructor
    … …  
    116116  {
    117117    // retrieve Objects.
    118     NewObjectList<GLGuiWidget>::const_iterator it, currentIt;
     118    ObjectList<GLGuiWidget>::const_iterator it, currentIt;
    119119    currentIt = GLGuiWidget::objectList().end();
    120120
    … …  
    154154  void GLGuiHandler::selectPrevious()
    155155  {
    156     NewObjectList<GLGuiWidget>::const_iterator it, currentIt;
     156    ObjectList<GLGuiWidget>::const_iterator it, currentIt;
    157157    currentIt = GLGuiWidget::objectList().begin();
    158158
    … …  
    286286    if (this->_cursor != NULL)
    287287    {
    288       for (NewObjectList<GLGuiWidget>::const_iterator it = GLGuiWidget::objectList().begin();
     288      for (ObjectList<GLGuiWidget>::const_iterator it = GLGuiWidget::objectList().begin();
    289289           it != GLGuiWidget::objectList().end();
    290290           it++)

  • branches/new_class_id/src/lib/gui/gl/glgui_handler.h

    r9689 r9715  
    1919  class GLGuiHandler : public EventListener
    2020  {
    21     NewObjectListDeclaration(GLGuiHandler);
     21    ObjectListDeclaration(GLGuiHandler);
    2222  public:
    2323    /** @returns a Pointer to the only object of this Class */

  • branches/new_class_id/src/lib/gui/gl/glgui_image.cc

    r9689 r9715  
    2222namespace OrxGui
    2323{
    24   NewObjectListDefinition(GLGuiImage);
     24  ObjectListDefinition(GLGuiImage);
    2525  /**
    2626   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_image.h

    r9689 r9715  
    2121  class GLGuiImage : public GLGuiWidget
    2222  {
    23     NewObjectListDeclaration(GLGuiImage);
     23    ObjectListDeclaration(GLGuiImage);
    2424  public:
    2525    GLGuiImage();

  • branches/new_class_id/src/lib/gui/gl/glgui_inputline.cc

    r9689 r9715  
    2020namespace OrxGui
    2121{
    22   NewObjectListDefinition(GLGuiInputLine);
     22  ObjectListDefinition(GLGuiInputLine);
    2323  /**
    2424   * @brief standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_inputline.h

    r9689 r9715  
    2525  class GLGuiInputLine : public OrxGui::GLGuiWidget
    2626  {
    27     NewObjectListDeclaration(GLGuiInputLine);
     27    ObjectListDeclaration(GLGuiInputLine);
    2828  public:
    2929    GLGuiInputLine();

  • branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.cc

    r9689 r9715  
    2020namespace OrxGui
    2121{
    22   NewObjectListDefinition(GLGuiMainWidget);
     22  ObjectListDefinition(GLGuiMainWidget);
    2323
    2424  /**

  • branches/new_class_id/src/lib/gui/gl/glgui_mainwidget.h

    r9689 r9715  
    1515  class GLGuiMainWidget : public GLGuiWidget
    1616  {
    17     NewObjectListDeclaration(GLGuiMainWidget);
     17    ObjectListDeclaration(GLGuiMainWidget);
    1818  public:
    1919    virtual ~GLGuiMainWidget(void);

  • branches/new_class_id/src/lib/gui/gl/glgui_menu.cc

    r9689 r9715  
    2020namespace OrxGui
    2121{
    22   NewObjectListDefinition(GLGuiMenu);
     22  ObjectListDefinition(GLGuiMenu);
    2323  /**
    2424   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_menu.h

    r9689 r9715  
    1919  class GLGuiMenu : public GLGuiMenu
    2020  {
    21     NewObjectListDeclaration(GLGuiMenu);
     21    ObjectListDeclaration(GLGuiMenu);
    2222  public:
    2323    GLGuiMenu();

  • branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.cc

    r9689 r9715  
    2323namespace OrxGui
    2424{
    25   NewObjectListDefinition(GLGuiPushButton);
     25  ObjectListDefinition(GLGuiPushButton);
    2626  /**
    2727   * @brief standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_pushbutton.h

    r9689 r9715  
    2121  class GLGuiPushButton : public GLGuiButton
    2222  {
    23     NewObjectListDeclaration(GLGuiPushButton);
     23    ObjectListDeclaration(GLGuiPushButton);
    2424  public:
    2525    GLGuiPushButton(const std::string& label = "");

  • branches/new_class_id/src/lib/gui/gl/glgui_slider.cc

    r9689 r9715  
    2323namespace OrxGui
    2424{
    25   NewObjectListDefinition(GLGuiSlider);
     25  ObjectListDefinition(GLGuiSlider);
    2626  /**
    2727   * @brief standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_slider.h

    r9689 r9715  
    2121  class GLGuiSlider : public GLGuiWidget
    2222  {
    23     NewObjectListDeclaration(GLGuiSlider);
     23    ObjectListDeclaration(GLGuiSlider);
    2424  public:
    2525    GLGuiSlider();

  • branches/new_class_id/src/lib/gui/gl/glgui_table.cc

    r9689 r9715  
    2323namespace OrxGui
    2424{
    25   NewObjectListDefinition(GLGuiTable);
     25  ObjectListDefinition(GLGuiTable);
    2626  /**
    2727   * @brief standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_table.h

    r9689 r9715  
    2525  class GLGuiTable : public OrxGui::GLGuiWidget
    2626  {
    27     NewObjectListDeclaration(GLGuiTable);
     27    ObjectListDeclaration(GLGuiTable);
    2828  public:
    2929    GLGuiTable(unsigned int rows, unsigned int columns);

  • branches/new_class_id/src/lib/gui/gl/glgui_text.cc

    r9689 r9715  
    2222namespace OrxGui
    2323{
    24   NewObjectListDefinition(GLGuiText);
     24  ObjectListDefinition(GLGuiText);
    2525  /**
    2626   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_text.h

    r9689 r9715  
    2020  class GLGuiText : public GLGuiWidget
    2121  {
    22     NewObjectListDeclaration(GLGuiText);
     22    ObjectListDeclaration(GLGuiText);
    2323  public:
    2424    GLGuiText();

  • branches/new_class_id/src/lib/gui/gl/glgui_textfield.cc

    r9689 r9715  
    2222namespace OrxGui
    2323{
    24   NewObjectListDefinition(GLGuiTextfield);
     24  ObjectListDefinition(GLGuiTextfield);
    2525  /**
    2626   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_textfield.h

    r9689 r9715  
    2020  class GLGuiTextfield : public GLGuiWidget
    2121  {
    22     NewObjectListDeclaration(GLGuiTextfield);
     22    ObjectListDeclaration(GLGuiTextfield);
    2323  public:
    2424    GLGuiTextfield();

  • branches/new_class_id/src/lib/gui/gl/glgui_widget.cc

    r9689 r9715  
    3131namespace OrxGui
    3232{
    33   NewObjectListDefinition(GLGuiWidget);
     33  ObjectListDefinition(GLGuiWidget);
    3434  /**
    3535   * @brief standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_widget.h

    r9689 r9715  
    3030  class GLGuiWidget : public Element2D
    3131  {
    32     NewObjectListDeclaration(GLGuiWidget);
     32    ObjectListDeclaration(GLGuiWidget);
    3333  public:
    3434    GLGuiWidget(GLGuiWidget* parent = NULL);

  • branches/new_class_id/src/lib/gui/gl/glgui_window.cc

    r9689 r9715  
    2020namespace OrxGui
    2121{
    22   NewObjectListDefinition(GLGuiWindow);
     22  ObjectListDefinition(GLGuiWindow);
    2323  /**
    2424   * standard constructor

  • branches/new_class_id/src/lib/gui/gl/glgui_window.h

    r9689 r9715  
    2020  class GLGuiWindow : public GLGuiContainer
    2121  {
    22     NewObjectListDeclaration(GLGuiWindow);
     22    ObjectListDeclaration(GLGuiWindow);
    2323  public:
    2424    GLGuiWindow();

  • branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc

    r9709 r9715  
    2626
    2727#include "class_id.h"
    28 NewObjectListDefinitionID(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
     28ObjectListDefinitionID(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
    2929CREATE_FACTORY(GLMenuImageScreen);
    3030

  • branches/new_class_id/src/lib/gui/gl/glmenu/glmenu_imagescreen.h

    r9689 r9715  
    1515class GLMenuImageScreen : public BaseObject
    1616{
    17   NewObjectListDeclaration(GLMenuImageScreen);
     17  ObjectListDeclaration(GLMenuImageScreen);
    1818public:
    1919  GLMenuImageScreen (const TiXmlElement* root = NULL);

  • branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.cc

    r9689 r9715  
    2323namespace OrxGui
    2424{
    25   NewObjectListDefinition(GLGuiNotifier);
     25  ObjectListDefinition(GLGuiNotifier);
    2626  /**
    2727   * @brief standard constructor

  • branches/new_class_id/src/lib/gui/gl/specials/glgui_notifier.h

    r9689 r9715  
    2424  class GLGuiNotifier : public GLGuiWidget
    2525  {
    26     NewObjectListDeclaration(GLGuiNotifier);
     26    ObjectListDeclaration(GLGuiNotifier);
    2727  public:
    2828    GLGuiNotifier();

  • branches/new_class_id/src/lib/lang/base_object.cc

    r9691 r9715  
    2121#include "util/loading/load_param.h"
    2222
    23 NewObjectListDefinition(BaseObject);
     23ObjectListDefinition(BaseObject);
    2424
    2525/**
    … …  
    4343BaseObject::~BaseObject ()
    4444{
    45   /// Remove from the NewObjectLists
     45  /// Remove from the ObjectLists
    4646  ClassList::iterator it;
    4747  for (it = this->_classes.begin(); it != this->_classes.end(); ++it)
    … …  
    8989 * @return True if found, false if not.
    9090 */
    91 bool BaseObject::isA(const NewObjectListBase& objectList) const
     91bool BaseObject::isA(const ObjectListBase& objectList) const
    9292{
    9393  ClassList::const_iterator it;
    … …  
    104104 * @return True if found, false if not.
    105105 */
    106 bool BaseObject::isA(const NewClassID& classID) const
     106bool BaseObject::isA(const ClassID& classID) const
    107107{
    108108  ClassList::const_iterator it;

  • branches/new_class_id/src/lib/lang/base_object.h

    r9709 r9715  
    2626class BaseObject : public sigslot::has_slots<>
    2727{
    28   NewObjectListDeclaration(BaseObject);
     28  ObjectListDeclaration(BaseObject);
    2929public:
    3030  BaseObject (const std::string& objectName = "");
    … …  
    4848  inline const std::string& getClassName() const { return _classes.front()._objectList->name(); };
    4949
    50   inline const NewClassID& getClassID() const { return *_leafClassID; }
     50  inline const ClassID& getClassID() const { return *_leafClassID; }
    5151  /** @returns the ID of the Topmost object of the ClassStack */
    5252  inline const int& getLeafClassID() const { return _leafClassID->id(); }
    5353
    54   bool isA(const NewObjectListBase& objectList) const;
    55   bool isA(const NewClassID& classID) const;
     54  bool isA(const ObjectListBase& objectList) const;
     55  bool isA(const ClassID& classID) const;
    5656  bool isA(int classID) const;
    5757  bool isA(const std::string& className) const;
    … …  
    6565
    6666protected:
    67   template<class T> void registerObject(T* object, NewObjectList<T>& list);
     67  template<class T> void registerObject(T* object, ObjectList<T>& list);
    6868
    6969protected:
    … …  
    8080  struct ClassEntry
    8181  {
    82     /** Simple Constuctor @param objectList the NewObjectList, @param iterator the (intrusive) Iterator inside of the ObjectList */
    83     inline ClassEntry (NewObjectListBase* objectList, NewObjectListBase::IteratorBase* iterator) : _objectList(objectList), _iterator(iterator) {}
    84     NewObjectListBase*                _objectList;  //!< A ObjectList this Object is part of
    85     NewObjectListBase::IteratorBase*  _iterator;    //!< An iterator pointing to the position of the Object inside of the List.
     82    /** Simple Constuctor @param objectList the ObjectList, @param iterator the (intrusive) Iterator inside of the ObjectList */
     83    inline ClassEntry (ObjectListBase* objectList, ObjectListBase::IteratorBase* iterator) : _objectList(objectList), _iterator(iterator) {}
     84    ObjectListBase*                _objectList;  //!< A ObjectList this Object is part of
     85    ObjectListBase::IteratorBase*  _iterator;    //!< An iterator pointing to the position of the Object inside of the List.
    8686  };
    8787  typedef std::list<ClassEntry>        ClassList;   //!< Type definition for the List.
    … …  
    8989  std::string                         className;    //!< the name of the class
    9090  ClassList                           _classes;     //!< All Classes this object is part of.
    91   const NewClassID*                       _leafClassID;  //!< Topmost ClassID.
     91  const ClassID*                       _leafClassID;  //!< Topmost ClassID.
    9292};
    9393
    … …  
    103103 */
    104104template<class T>
    105 inline void BaseObject::registerObject(T* object, NewObjectList<T>& objectList)
     105inline void BaseObject::registerObject(T* object, ObjectList<T>& objectList)
    106106{
    107107  this->_leafClassID = &objectList.identity();

  • branches/new_class_id/src/lib/lang/new_class_id.cc

    r9709 r9715  
    2323 * this Always points to the ID of the NullClass.
    2424 */
    25 NewClassID::NewClassID()
     25ClassID::ClassID()
    2626{
    2727  NullClass::acquireID(this->_id, this->_name);
    … …  
    3030/**
    3131 * @brief Acquiring the ID of a objectList.
    32  * @param objList The NewObjectList to acquire the ID from.
     32 * @param objList The ObjectList to acquire the ID from.
    3333 */
    34 NewClassID::NewClassID(const NewObjectListBase* const objList)
     34ClassID::ClassID(const ObjectListBase* const objList)
    3535{
    3636  objList->acquireID(this->_id, this->_name);
    … …  
    3838
    3939
    40 NewClassID NullClass::_classID;
     40ClassID NullClass::_classID;
    4141
    4242int NullClass::_nullID;

  • branches/new_class_id/src/lib/lang/new_class_id.h

    r9709 r9715  
    1010#include <string>
    1111
    12 class NewObjectListBase;
     12class ObjectListBase;
    1313
    1414//! A class to dynamically allocate ClassID's and to support a isA operator
    1515/**
    16  * A NewClassID can only be aquired over a NewObjectList,
     16 * A ClassID can only be aquired over a ObjectList,
    1717 * thus enabling the developer to have permanent access to the correct ID and ClassName
    1818 *
    19  * The Idea behind this concept is, that storing a NewClassID that changes its internal state
    20  * all NewClassID's will be updated correctly.
     19 * The Idea behind this concept is, that storing a ClassID that changes its internal state
     20 * all ClassID's will be updated correctly.
    2121 *
    22  * Since the Existance of any NewObjectList is a requirement during the working process all
     22 * Since the Existance of any ObjectList is a requirement during the working process all
    2323 * ID's should reference a valid ID and ClassName
    2424 */
    25 class NewClassID
     25class ClassID
    2626{
    2727public:
    28   NewClassID();
    29   NewClassID(const NewObjectListBase* const id);
     28  ClassID();
     29  ClassID(const ObjectListBase* const id);
    3030  /// the copy constructor is also defined implicitely.
    3131
    … …  
    3636
    3737  /** @param id the id to compare @returns true on match (match is same ID) @brief compares two id's */
    38   bool operator==(const NewClassID& id) const { return *_id == *id._id /* || _name == id._name */; };
     38  bool operator==(const ClassID& id) const { return *_id == *id._id /* || _name == id._name */; };
    3939  /** @param id the id to compare @returns true on match (match is same ID) @brief compares two id's */
    4040  bool operator==(int id) const { return *_id == id; };
    … …  
    4242  bool operator==(const std::string& name) const { return *_name == name; };
    4343  /** @param id the id to compare @returns false on match (match is same ID) @brief compares two id's */
    44   bool operator!=(const NewClassID& id) const { return *_id != *id._id /* && _name != id._name*/;  };
     44  bool operator!=(const ClassID& id) const { return *_id != *id._id /* && _name != id._name*/;  };
    4545  /** @param id the id to compare @returns false on match (match is same ID) @brief compares two id's */
    4646  bool operator!=(int id) const { return *_id != id; };
    … …  
    6161public:
    6262  /** @returns the NullClass' ID. */
    63   static const NewClassID& classID() { return NullClass::_classID; }
     63  static const ClassID& classID() { return NullClass::_classID; }
    6464  /** @param id the ID to acquire @param name the name to acquire @brief acquires the ID of this Class */
    6565  static void acquireID(const int*& id, const std::string*& name) { id = &_nullID; name = &_nullName; };
    … …  
    6969
    7070private:
    71   static NewClassID         _classID;      //!< The NullClass' ID
     71  static ClassID         _classID;      //!< The NullClass' ID
    7272  static const std::string  _nullName;     //!< The NullClass' Name ("NullClass")
    7373  static int                _nullID;       //!< The NullClass' ID

  • branches/new_class_id/src/lib/lang/new_object_list.cc

    r9709 r9715  
    2828 * @return a new NewObejctList
    2929 */
    30 NewObjectListBase::NewObjectListBase(const std::string& className, int id)
     30ObjectListBase::ObjectListBase(const std::string& className, int id)
    3131    : _name(className)
    3232{
    33   printf("NewObjectList, Registered %s::%d\n", className.c_str(), id);
    34   if (NewObjectListBase::_classesByID == NULL)
    35   {
    36     NewObjectListBase::_classesByID = new classIDMap;
    37     assert (NewObjectListBase::_classesByName == NULL);
    38     NewObjectListBase::_classesByName = new classNameMap;
    39   }
    40   assert(!NewObjectListBase::classNameExists(className) && "Classes should only be included once, and no two classes should have the same name (key value)");
     33  printf("ObjectList, Registered %s::%d\n", className.c_str(), id);
     34  if (ObjectListBase::_classesByID == NULL)
     35  {
     36    ObjectListBase::_classesByID = new classIDMap;
     37    assert (ObjectListBase::_classesByName == NULL);
     38    ObjectListBase::_classesByName = new classNameMap;
     39  }
     40  assert(!ObjectListBase::classNameExists(className) && "Classes should only be included once, and no two classes should have the same name (key value)");
    4141
    4242  if (id == -1)
    4343  {
    44     id = NewObjectListBase::_classesByID->size();
     44    id = ObjectListBase::_classesByID->size();
    4545    // searching for a free ID
    46     while (NewObjectListBase::classIDExists(id)) ++id;
    47   }
    48   assert(!NewObjectListBase::classIDExists(id) && "Classes should only be included once, and no two classes should have the same ID (key value)");
     46    while (ObjectListBase::classIDExists(id)) ++id;
     47  }
     48  assert(!ObjectListBase::classIDExists(id) && "Classes should only be included once, and no two classes should have the same ID (key value)");
    4949
    5050  _id = id;
    … …  
    5252  std::cout << "register new ObjectList " << className << " ID: " << this->_id << std::endl;
    5353
    54   this->_identity = NewClassID(this);
    55   (*NewObjectListBase::_classesByID)[this->_identity.id()] = this;
    56   (*NewObjectListBase::_classesByName)[this->_identity.name()] = this;
     54  this->_identity = ClassID(this);
     55  (*ObjectListBase::_classesByID)[this->_identity.id()] = this;
     56  (*ObjectListBase::_classesByName)[this->_identity.name()] = this;
    5757}
    5858
    … …  
    6161 * Destructor.
    6262 *
    63  * This destructor deletes the NewObjectList, and cleans up the NewObjectList sorted Maps.
    64  */
    65 NewObjectListBase::~NewObjectListBase()
    66 {
    67   assert (NewObjectListBase::_classesByName != NULL && NewObjectListBase::_classesByID != NULL);
     63 * This destructor deletes the ObjectList, and cleans up the ObjectList sorted Maps.
     64 */
     65ObjectListBase::~ObjectListBase()
     66{
     67  assert (ObjectListBase::_classesByName != NULL && ObjectListBase::_classesByID != NULL);
    6868  /*
    6969  std::cout << "Erasing: " << this->_name << " "<< this->_id  << std::endl;
    70   std::cout << "SIZE OF _classByID: " << NewObjectListBase::_classesByID->size() << std::endl;
    71   std::cout << "SIZE OF _classByName: " << NewObjectListBase::_classesByName->size() << std::endl;
     70  std::cout << "SIZE OF _classByID: " << ObjectListBase::_classesByID->size() << std::endl;
     71  std::cout << "SIZE OF _classByName: " << ObjectListBase::_classesByName->size() << std::endl;
    7272  */
    73   NewObjectListBase::_classesByID->erase(this->_identity.id());
    74   NewObjectListBase::_classesByName->erase(this->_identity.name());
    75 
    76   if (NewObjectListBase::_classesByID->empty())
    77   {
    78     delete NewObjectListBase::_classesByID;
    79     NewObjectListBase::_classesByID = NULL;
    80     assert(NewObjectListBase::_classesByName != NULL);
    81     delete NewObjectListBase::_classesByName;
    82     NewObjectListBase::_classesByName = NULL;
    83   }
    84 }
    85 
    86 NewObjectListBase::classIDMap* NewObjectListBase::_classesByID = NULL;
    87 NewObjectListBase::classNameMap* NewObjectListBase::_classesByName = NULL;
     73  ObjectListBase::_classesByID->erase(this->_identity.id());
     74  ObjectListBase::_classesByName->erase(this->_identity.name());
     75
     76  if (ObjectListBase::_classesByID->empty())
     77  {
     78    delete ObjectListBase::_classesByID;
     79    ObjectListBase::_classesByID = NULL;
     80    assert(ObjectListBase::_classesByName != NULL);
     81    delete ObjectListBase::_classesByName;
     82    ObjectListBase::_classesByName = NULL;
     83  }
     84}
     85
     86ObjectListBase::classIDMap* ObjectListBase::_classesByID = NULL;
     87ObjectListBase::classNameMap* ObjectListBase::_classesByName = NULL;
    8888
    8989/**
    9090 * @returns the Registered Class Count.
    9191 */
    92 unsigned int NewObjectListBase::classCount()
    93 {
    94   assert (NewObjectListBase::_classesByID != NULL);
    95   return NewObjectListBase::_classesByID->size();
     92unsigned int ObjectListBase::classCount()
     93{
     94  assert (ObjectListBase::_classesByID != NULL);
     95  return ObjectListBase::_classesByID->size();
    9696};
    9797
    … …  
    101101 * @return true if such a class already exists.
    102102 */
    103 bool NewObjectListBase::classIDExists(int id)
    104 {
    105   return (NewObjectListBase::_classesByID->find(id) != NewObjectListBase::_classesByID->end());
     103bool ObjectListBase::classIDExists(int id)
     104{
     105  return (ObjectListBase::_classesByID->find(id) != ObjectListBase::_classesByID->end());
    106106}
    107107
    … …  
    111111 * @return true if such a class already exists.
    112112 */
    113 bool NewObjectListBase::classNameExists(const std::string& name)
    114 {
    115   return (NewObjectListBase::_classesByName->find(name) != NewObjectListBase::_classesByName->end());
    116 }
    117 
    118 /**
    119  * @brief searches for a NewClassID in the list of all NewObjectLists, and returns its Identity
     113bool ObjectListBase::classNameExists(const std::string& name)
     114{
     115  return (ObjectListBase::_classesByName->find(name) != ObjectListBase::_classesByName->end());
     116}
     117
     118/**
     119 * @brief searches for a ClassID in the list of all ObjectLists, and returns its Identity
    120120 * @param id: The Id to search for
    121121 * @returns the ClassID if found and NullClass' identity if not.
    122122 */
    123 const NewClassID& NewObjectListBase::retrieveIdentity(int id)
    124 {
    125   const NewObjectListBase* const base = NewObjectListBase::getObjectList(id);
     123const ClassID& ObjectListBase::retrieveIdentity(int id)
     124{
     125  const ObjectListBase* const base = ObjectListBase::getObjectList(id);
    126126
    127127  if (base != NULL)
    … …  
    133133
    134134/**
    135  * @brief searches for a NewClassID in the list of all NewObjectLists, and returns its Identity
     135 * @brief searches for a ClassID in the list of all ObjectLists, and returns its Identity
    136136 * @param name: The Name to search for
    137137 * @returns the ClassID if found and NullClass' identity if not.
    138138 */
    139 const NewClassID& NewObjectListBase::retrieveIdentity(const std::string& name)
    140 {
    141   const NewObjectListBase* const base = NewObjectListBase::getObjectList(name);
     139const ClassID& ObjectListBase::retrieveIdentity(const std::string& name)
     140{
     141  const ObjectListBase* const base = ObjectListBase::getObjectList(name);
    142142
    143143  if (base != NULL)
    … …  
    151151 * @brief Searches for a ObjectList with the ID classID
    152152 * @param classID the ID to search for.
    153  * @return The NewObjectList if found, NULL otherwise.
    154  */
    155 const NewObjectListBase* const NewObjectListBase::getObjectList(int classID)
    156 {
    157   assert (NewObjectListBase::_classesByID != NULL);
    158   NewObjectListBase::classIDMap::iterator it = NewObjectListBase::_classesByID->find(classID);
    159   if (it != NewObjectListBase::_classesByID->end())
     153 * @return The ObjectList if found, NULL otherwise.
     154 */
     155const ObjectListBase* const ObjectListBase::getObjectList(int classID)
     156{
     157  assert (ObjectListBase::_classesByID != NULL);
     158  ObjectListBase::classIDMap::iterator it = ObjectListBase::_classesByID->find(classID);
     159  if (it != ObjectListBase::_classesByID->end())
    160160    return (*it).second;
    161161  else
    … …  
    166166 * @brief Searches for a ObjectList with the Name className
    167167 * @param className the Name to search for.
    168  * @return The NewObjectList if found, NULL otherwise.
    169  */
    170 const NewObjectListBase* const NewObjectListBase::getObjectList(const std::string& className)
    171 {
    172   assert (NewObjectListBase::_classesByName != NULL);
    173   NewObjectListBase::classNameMap::iterator it = NewObjectListBase::_classesByName->find(className);
    174   if (it != NewObjectListBase::_classesByName->end())
     168 * @return The ObjectList if found, NULL otherwise.
     169 */
     170const ObjectListBase* const ObjectListBase::getObjectList(const std::string& className)
     171{
     172  assert (ObjectListBase::_classesByName != NULL);
     173  ObjectListBase::classNameMap::iterator it = ObjectListBase::_classesByName->find(className);
     174  if (it != ObjectListBase::_classesByName->end())
    175175    return (*it).second;
    176176  else
    … …  
    179179
    180180/**
    181  * @brief Searches for a ObjectList with the NewClassID classID
     181 * @brief Searches for a ObjectList with the ClassID classID
    182182 * @param classID the ID to search for.
    183  * @return The NewObjectList if found, NULL otherwise.
    184  */
    185 const NewObjectListBase* const NewObjectListBase::getObjectList(const NewClassID& classID)
    186 {
    187   return NewObjectListBase::getObjectList(classID.id());
     183 * @return The ObjectList if found, NULL otherwise.
     184 */
     185const ObjectListBase* const ObjectListBase::getObjectList(const ClassID& classID)
     186{
     187  return ObjectListBase::getObjectList(classID.id());
    188188}
    189189
    … …  
    193193 * @param objectName the Name of the Object to search for
    194194 */
    195 BaseObject* NewObjectListBase::getBaseObject(int classID, const std::string& objectName)
    196 {
    197   const NewObjectListBase* const base = NewObjectListBase::getObjectList(classID);
     195BaseObject* ObjectListBase::getBaseObject(int classID, const std::string& objectName)
     196{
     197  const ObjectListBase* const base = ObjectListBase::getObjectList(classID);
    198198
    199199  if (base != NULL)
    … …  
    208208 * @param objectName the Name of the Object to search for
    209209 */
    210 BaseObject* NewObjectListBase::getBaseObject(const std::string& className, const std::string& objectName)
    211 {
    212   const NewObjectListBase* const base = NewObjectListBase::getObjectList(className);
     210BaseObject* ObjectListBase::getBaseObject(const std::string& className, const std::string& objectName)
     211{
     212  const ObjectListBase* const base = ObjectListBase::getObjectList(className);
    213213
    214214  if (base != NULL)
    … …  
    220220/**
    221221 * @brief Retrieves the first BaseObject matching the name objectName from the List matching classID.
    222  * @param classID The NewClassID of the List.
     222 * @param classID The ClassID of the List.
    223223 * @param objectName the Name of the Object to search for
    224224 */
    225 BaseObject* NewObjectListBase::getBaseObject(const NewClassID& classID, const std::string& objectName)
    226 {
    227   const NewObjectListBase* const base = NewObjectListBase::getObjectList(classID);
     225BaseObject* ObjectListBase::getBaseObject(const ClassID& classID, const std::string& objectName)
     226{
     227  const ObjectListBase* const base = ObjectListBase::getObjectList(classID);
    228228
    229229  if (base != NULL)
    … …  
    238238 * @brief Prints out some debugging information about a given List.
    239239 */
    240 void NewObjectListBase::debug(unsigned int level) const
     240void ObjectListBase::debug(unsigned int level) const
    241241{
    242242  base_list list;
    … …  
    259259
    260260
    261 void NewObjectListBase::debugAll(unsigned int level)
    262 {
    263   printf("Listing all %d ObjectLists \n", NewObjectListBase::_classesByID->size());
    264 
    265   for (classNameMap::const_iterator it = NewObjectListBase::_classesByName->begin();
    266        it != NewObjectListBase::_classesByName->end();
     261void ObjectListBase::debugAll(unsigned int level)
     262{
     263  printf("Listing all %d ObjectLists \n", ObjectListBase::_classesByID->size());
     264
     265  for (classNameMap::const_iterator it = ObjectListBase::_classesByName->begin();
     266       it != ObjectListBase::_classesByName->end();
    267267       ++it)
    268268  {
    … …  
    280280 * @return The ClassName or an empty string if the ID was not found.
    281281 */
    282 const std::string& NewObjectListBase::IDToString(int classID)
    283 {
    284   const NewObjectListBase* const base = NewObjectListBase::getObjectList(classID);
     282const std::string& ObjectListBase::IDToString(int classID)
     283{
     284  const ObjectListBase* const base = ObjectListBase::getObjectList(classID);
    285285
    286286  if (base != NULL)
    … …  
    299299 * @return The Classes ID if found, -1 otherwise.
    300300 */
    301 int NewObjectListBase::StringToID(const std::string& className)
    302 {
    303   const NewObjectListBase* const base = NewObjectListBase::getObjectList(className);
     301int ObjectListBase::StringToID(const std::string& className)
     302{
     303  const ObjectListBase* const base = ObjectListBase::getObjectList(className);
    304304
    305305  if (base != NULL)

  • branches/new_class_id/src/lib/lang/new_object_list.h

    r9713 r9715  
    2121 * two new functions objectList() and classID().
    2222 */
    23 #define NewObjectListDeclaration(ClassName) \
     23#define ObjectListDeclaration(ClassName) \
    2424  public: \
    25    static inline const NewObjectList<ClassName>& objectList() { return ClassName::_objectList; }; \
    26    static inline const NewClassID& classID() { return ClassName::_objectList.identity(); }; \
     25   static inline const ObjectList<ClassName>& objectList() { return ClassName::_objectList; }; \
     26   static inline const ClassID& classID() { return ClassName::_objectList.identity(); }; \
    2727  private: \
    28    static NewObjectList<ClassName> _objectList
    29 
    30 #define NewObjectListDefinitionID(ClassName, ID) \
    31    NewObjectList<ClassName> ClassName::_objectList(#ClassName, ID)
    32 
    33 
    34 #define NewObjectListDefinition(ClassName) \
    35     NewObjectListDefinitionID(ClassName, -1)
     28   static ObjectList<ClassName> _objectList
     29
     30#define ObjectListDefinitionID(ClassName, ID) \
     31   ObjectList<ClassName> ClassName::_objectList(#ClassName, ID)
     32
     33
     34#define ObjectListDefinition(ClassName) \
     35    ObjectListDefinitionID(ClassName, -1)
    3636
    3737class BaseObject;
    38 //! The superclass that all NewObjectLists follow.
    39 /**
    40  * @see template<class T> NewObjectList<T>
    41  */
    42 class NewObjectListBase
     38//! The superclass that all ObjectLists follow.
     39/**
     40 * @see template<class T> ObjectList<T>
     41 */
     42class ObjectListBase
    4343{
    4444public:
    … …  
    5656public:
    5757  /** @returns The Identity of the Class stored within. */
    58   inline const NewClassID&              identity() const { return _identity; }
     58  inline const ClassID&              identity() const { return _identity; }
    5959  /** @returns the ID of the Identity of the ObjectList */
    6060  inline int                            id() const { return _id; };
    … …  
    6464  inline bool                           operator==(int id) const { return _id == id; };
    6565  /** @param id The id to compare @returns true on match, false otherwise */
    66   inline bool                           operator==(const NewClassID& id) const { return id == _id; };
     66  inline bool                           operator==(const ClassID& id) const { return id == _id; };
    6767  /** @param name The name to compare @returns true on match, false otherwise */
    6868  inline bool                           operator==(const std::string& name) const { return _name == name; };
    … …  
    7272  virtual void                          getBaseObjectList(base_list* list) const = 0;
    7373
    74   static const NewClassID&              retrieveIdentity(int id);
    75   static const NewClassID&              retrieveIdentity(const std::string& name);
    76 
    77   static const NewObjectListBase* const getObjectList(int classID);
    78   static const NewObjectListBase* const getObjectList(const std::string& className);
    79   static const NewObjectListBase* const getObjectList(const NewClassID& classID);
     74  static const ClassID&              retrieveIdentity(int id);
     75  static const ClassID&              retrieveIdentity(const std::string& name);
     76
     77  static const ObjectListBase* const getObjectList(int classID);
     78  static const ObjectListBase* const getObjectList(const std::string& className);
     79  static const ObjectListBase* const getObjectList(const ClassID& classID);
    8080
    8181  static BaseObject*                    getBaseObject(int classID, const std::string& objectName);
    8282  static BaseObject*                    getBaseObject(const std::string& className, const std::string& objectName);
    83   static BaseObject*                    getBaseObject(const NewClassID& classID, const std::string& objectName);
     83  static BaseObject*                    getBaseObject(const ClassID& classID, const std::string& objectName);
    8484
    8585  /** @returns an Object with Name name out of this List @param name the name of the Object. */
    … …  
    100100
    101101protected:
    102   NewObjectListBase(const std::string& className, int id = -1);
    103   virtual ~NewObjectListBase();
    104 
    105 private:
    106   NewObjectListBase(const NewObjectListBase&);
     102  ObjectListBase(const std::string& className, int id = -1);
     103  virtual ~ObjectListBase();
     104
     105private:
     106  ObjectListBase(const ObjectListBase&);
    107107
    108108  static bool                         classIDExists(int id);
    … …  
    111111
    112112protected:
    113   typedef std::map<int, NewObjectListBase*>         classIDMap;   //!< The Generic Map.
    114   typedef std::map<std::string, NewObjectListBase*> classNameMap; //!< The Generic Map.
     113  typedef std::map<int, ObjectListBase*>         classIDMap;   //!< The Generic Map.
     114  typedef std::map<std::string, ObjectListBase*> classNameMap; //!< The Generic Map.
    115115
    116116private:
    117117  int                           _id;
    118118  const std::string             _name;              //!< The Name of the Class.
    119   NewClassID                    _identity;          //!< The Identity of the Class. (equal to _id and _name)
     119  ClassID                    _identity;          //!< The Identity of the Class. (equal to _id and _name)
    120120
    121121private:
    … …  
    135135 *  as with normal std::list.
    136136 *
    137  * Furthermore the linkage over the single Lists is given over the Superclass NewObjectListBase.
     137 * Furthermore the linkage over the single Lists is given over the Superclass ObjectListBase.
    138138 *
    139139 *
    … …  
    141141 *
    142142 * To define a Class with a ObjectList, you have to:
    143  *  1. Include 'NewObjectListDeclaration(T);' in its Declaration (at the beginning)
    144  *  2. Include 'NewObjectListDefinition(T);' in some Definition file (cc-file)
     143 *  1. Include 'ObjectListDeclaration(T);' in its Declaration (at the beginning)
     144 *  2. Include 'ObjectListDefinition(T);' in some Definition file (cc-file)
    145145 *  3. In the constructor add 'registerObject(this, objectList);'
    146146 *
    … …  
    154154 *
    155155 * @example Iterating: Iteration is made easy, and fast as follows:
    156  *   for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
     156 *   for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
    157157 *      it != PlayerStats::objectList().end();
    158158 *     ++it)
    … …  
    166166 */
    167167template<class T>
    168 class NewObjectList : public NewObjectListBase
     168class ObjectList : public ObjectListBase
    169169{
    170170public:
    … …  
    174174
    175175
    176 class Iterator : public NewObjectListBase::IteratorBase
     176class Iterator : public ObjectListBase::IteratorBase
    177177  {
    178178  public:
    179179    Iterator(iterator it) { _it = it; }
    180180    inline iterator& it() { return _it; }
    181     typename NewObjectList::iterator _it;
     181    typename ObjectList::iterator _it;
    182182  };
    183183
    184184public:
    185   NewObjectList(const std::string& name, int id = -1);
    186   ~NewObjectList();
     185  ObjectList(const std::string& name, int id = -1);
     186  ~ObjectList();
    187187
    188188  virtual BaseObject*                getBaseObject(const std::string& name) const;
    … …  
    210210
    211211
    212   NewObjectListBase::IteratorBase*   registerObject(T* object);
     212  ObjectListBase::IteratorBase*   registerObject(T* object);
    213213  virtual void                       unregisterObject(IteratorBase* iterator);
    214214
    215215protected:
    216   virtual void                       getBaseObjectList(NewObjectListBase::base_list* list) const;
     216  virtual void                       getBaseObjectList(ObjectListBase::base_list* list) const;
    217217
    218218
    219219private:
    220220  //! the copy constructor will be hidden.
    221   NewObjectList(const NewObjectList& definer) {};
     221  ObjectList(const ObjectList& definer) {};
    222222
    223223private:
    … …  
    233233/////////////////////////
    234234/**
    235  * @brief creates a new NewObjectList
     235 * @brief creates a new ObjectList
    236236 * @param name The name of the Class.
    237237 * @param id The ID of the class if desired, or -1 if an id should be assigned automatically.
    238238 */
    239239template <class T>
    240 NewObjectList<T>::NewObjectList(const std::string& name, int id)
    241     : NewObjectListBase(name, id)
     240ObjectList<T>::ObjectList(const std::string& name, int id)
     241    : ObjectListBase(name, id)
    242242{}
    243243
    244244/**
    245  * @brief deletes the NewObjectList.
    246  */
    247 template <class T>
    248 NewObjectList<T>::~NewObjectList()
     245 * @brief deletes the ObjectList.
     246 */
     247template <class T>
     248ObjectList<T>::~ObjectList()
    249249{
    250250  if (!_objects.empty())
    … …  
    260260 */
    261261template <class T>
    262 BaseObject* NewObjectList<T>::getBaseObject(const std::string& name) const
     262BaseObject* ObjectList<T>::getBaseObject(const std::string& name) const
    263263{
    264264  return this->getObject(name);
    … …  
    273273 */
    274274template <class T>
    275 T* NewObjectList<T>::getObject(const std::string& name) const
     275T* ObjectList<T>::getObject(const std::string& name) const
    276276{
    277277  const_iterator it;
    … …  
    288288 */
    289289template <class T>
    290     bool NewObjectList<T>::exists(const T* const object) const
     290    bool ObjectList<T>::exists(const T* const object) const
    291291{
    292292  return (std::find(_objects.begin(), _objects.end(), object) != _objects.end());
    … …  
    299299 */
    300300template <class T>
    301 void NewObjectList<T>::getBaseObjectList(NewObjectListBase::base_list* list) const
     301void ObjectList<T>::getBaseObjectList(ObjectListBase::base_list* list) const
    302302{
    303303  assert (list != NULL);
    … …  
    309309
    310310/**
    311  * @brief registers an Object to the NewObjectList.
     311 * @brief registers an Object to the ObjectList.
    312312 * @param T object the Object to register.
    313313 * @returns a pointer to the iterator inside of the list.
    314314 */
    315315template <class T>
    316 NewObjectListBase::IteratorBase* NewObjectList<T>::registerObject(T* object)
     316ObjectListBase::IteratorBase* ObjectList<T>::registerObject(T* object)
    317317{
    318318  this->_objects.push_back(object);
    … …  
    325325 */
    326326template <class T>
    327 void NewObjectList<T>::unregisterObject(IteratorBase* iterator)
     327void ObjectList<T>::unregisterObject(IteratorBase* iterator)
    328328{
    329329  this->_objects.erase(static_cast<Iterator*>(iterator)->it());

  • branches/new_class_id/src/lib/lang/test_object_list.cc

    r9682 r9715  
    1212  //   bool operator==(const std::string& name) const { return _objectName == name; };
    1313
    14     NewObjectListDeclaration(NewBaseObject);
     14    ObjectListDeclaration(NewBaseObject);
    1515
    1616protected:
    … …  
    2020  };
    2121  template<class T>
    22   inline void registerObject(T* object, NewObjectList<T>& objectList) { _id.registerObject(object, objectList); };
     22  inline void registerObject(T* object, ObjectList<T>& objectList) { _id.registerObject(object, objectList); };
    2323protected:
    24   NewClassID    _id;
     24  ClassID    _id;
    2525  std::string   _objectName;
    2626
    2727
    2828};
    29 NewObjectListDefinition(NewBaseObject);
     29ObjectListDefinition(NewBaseObject);
    3030
    3131
    … …  
    4040
    4141
    42   NewObjectListDeclaration(Test);
     42  ObjectListDeclaration(Test);
    4343  //ObjectListDeclaration(Test);
    4444};
    45 NewObjectListDefinitionID(Test, -1);
     45ObjectListDefinitionID(Test, -1);
    4646
    4747Test::Test()
    … …  
    7373    //  std::cout << "~Bone()\n";
    7474  };
    75   NewObjectListDeclaration(Bone);
     75  ObjectListDeclaration(Bone);
    7676};
    77 NewObjectListDefinitionID(Bone, -1);
     77ObjectListDefinitionID(Bone, -1);
    7878
    7979int main()

  • branches/new_class_id/src/lib/network/converter.cc

    r9690 r9715  
    2828SHELL_COMMAND_STATIC(debug, Converter, Converter::debug);
    2929
    30 NewObjectListDefinition(Converter);
     30ObjectListDefinition(Converter);
    3131/* using namespace std is default, this needs to be here */
    3232

  • branches/new_class_id/src/lib/network/converter.h

    r9690 r9715  
    2424class Converter : public BaseObject
    2525{
    26   NewObjectListDeclaration(Converter);
     26  ObjectListDeclaration(Converter);
    2727  public:
    2828    static byte* intToByteArray(int x);

  • branches/new_class_id/src/lib/network/data_stream.cc

    r9691 r9715  
    2020/* using namespace std is default, this needs to be here */
    2121
    22 NewObjectListDefinition(DataStream);
     22ObjectListDefinition(DataStream);
    2323
    2424/**

  • branches/new_class_id/src/lib/network/data_stream.h

    r9690 r9715  
    1717class DataStream : public BaseObject
    1818{
    19   NewObjectListDeclaration(DataStream);
     19  ObjectListDeclaration(DataStream);
    2020  public:
    2121      DataStream();

  • branches/new_class_id/src/lib/network/handshake.cc

    r9691 r9715  
    2323
    2424
    25 NewObjectListDefinition(Handshake);
     25ObjectListDefinition(Handshake);
    2626
    2727

  • branches/new_class_id/src/lib/network/handshake.h

    r9690 r9715  
    4242class Handshake : public Synchronizeable
    4343{
    44   NewObjectListDeclaration(Handshake);
     44  ObjectListDeclaration(Handshake);
    4545  public:
    4646    Handshake( int nodeType, int clientId = 0, int networkGameManagerId = 0, int messageManagerId = 0 );

  • branches/new_class_id/src/lib/network/message_manager.cc

    r9691 r9715  
    2828
    2929
    30 NewObjectListDefinition(MessageManager);
     30ObjectListDefinition(MessageManager);
    3131MessageManager* MessageManager::singletonRef = NULL;
    3232

  • branches/new_class_id/src/lib/network/message_manager.h

    r9690 r9715  
    9696class MessageManager : public Synchronizeable {
    9797
    98   NewObjectListDeclaration(MessageManager);
     98  ObjectListDeclaration(MessageManager);
    9999 public:
    100100   inline static MessageManager * getInstance(){ if (!singletonRef) singletonRef = new MessageManager();  return singletonRef; }

  • branches/new_class_id/src/lib/network/monitor/connection_monitor.cc

    r9691 r9715  
    2323/* using namespace std is default, this needs to be here */
    2424
    25 NewObjectListDefinition(ConnectionMonitor);
     25ObjectListDefinition(ConnectionMonitor);
    2626/**
    2727 * constructor

  • branches/new_class_id/src/lib/network/monitor/connection_monitor.h

    r9690 r9715  
    1919class ConnectionMonitor : virtual public BaseObject
    2020{
    21   NewObjectListDeclaration(ConnectionMonitor);
     21  ObjectListDeclaration(ConnectionMonitor);
    2222  public:
    2323    ConnectionMonitor( int userId );

  • branches/new_class_id/src/lib/network/monitor/network_monitor.cc

    r9691 r9715  
    3737SHELL_COMMAND(debug, NetworkMonitor, debug);
    3838
    39 NewObjectListDefinition(NetworkMonitor);
     39ObjectListDefinition(NetworkMonitor);
    4040
    4141

  • branches/new_class_id/src/lib/network/monitor/network_monitor.h

    r9690 r9715  
    2727class NetworkMonitor : public Synchronizeable
    2828{
    29   NewObjectListDeclaration(NetworkMonitor);
     29  ObjectListDeclaration(NetworkMonitor);
    3030  public:
    3131    NetworkMonitor(NetworkStream* networkStream);

  • branches/new_class_id/src/lib/network/monitor/network_stats_widget.cc

    r9709 r9715  
    211211
    212212
    213 NewObjectListDefinition(NetworkStatsWidget);
     213ObjectListDefinition(NetworkStatsWidget);
    214214/**
    215215 * @brief standard constructor

  • branches/new_class_id/src/lib/network/monitor/network_stats_widget.h

    r9691 r9715  
    8181class NetworkStatsWidget : public OrxGui::GLGuiFixedpositionBox
    8282{
    83   NewObjectListDeclaration(NetworkStatsWidget);
     83  ObjectListDeclaration(NetworkStatsWidget);
    8484  public:
    8585    static void toggleGUI();

  • branches/new_class_id/src/lib/network/network_game_manager.cc

    r9691 r9715  
    4646
    4747
    48 NewObjectListDefinition(NetworkGameManager);
     48ObjectListDefinition(NetworkGameManager);
    4949NetworkGameManager* NetworkGameManager::singletonRef = NULL;
    5050
    … …  
    9797
    9898  int          team = rules.getTeamForNewUser();
    99   NewClassID   playableClassId = rules.getPlayableClassId( userId, team );
     99  ClassID   playableClassId = rules.getPlayableClassId( userId, team );
    100100  std::string  playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
    101101  std::string  playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
    … …  
    186186  }
    187187
    188   for (NewObjectList<Synchronizeable>::const_iterator it = Synchronizeable::objectList().begin();
     188  for (ObjectList<Synchronizeable>::const_iterator it = Synchronizeable::objectList().begin();
    189189       it != Synchronizeable::objectList().end();
    190190      ++it)

  • branches/new_class_id/src/lib/network/network_game_manager.h

    r9690 r9715  
    3333class NetworkGameManager: public Synchronizeable
    3434{
    35   NewObjectListDeclaration(NetworkGameManager);
     35  ObjectListDeclaration(NetworkGameManager);
    3636  public:
    3737    virtual ~NetworkGameManager();

  • branches/new_class_id/src/lib/network/network_manager.cc

    r9691 r9715  
    4040
    4141
    42 NewObjectListDefinition(NetworkManager);
     42ObjectListDefinition(NetworkManager);
    4343NetworkManager* NetworkManager::singletonRef = NULL;
    4444

  • branches/new_class_id/src/lib/network/network_manager.h

    r9690 r9715  
    2525class NetworkManager : public BaseObject
    2626{
    27   NewObjectListDeclaration(NetworkManager);
     27  ObjectListDeclaration(NetworkManager);
    2828  public:
    2929

  • branches/new_class_id/src/lib/network/network_protocol.cc

    r9691 r9715  
    3535
    3636
    37 NewObjectListDefinition(NetworkProtocol);
     37ObjectListDefinition(NetworkProtocol);
    3838/**
    3939  standard constructor

  • branches/new_class_id/src/lib/network/network_protocol.h

    r9690 r9715  
    2525class NetworkProtocol : virtual public BaseObject
    2626{
    27   NewObjectListDeclaration(NetworkProtocol);
     27  ObjectListDeclaration(NetworkProtocol);
    2828  public:
    2929    NetworkProtocol();

  • branches/new_class_id/src/lib/network/network_socket.cc

    r9690 r9715  
    2424#include "network_socket.h"
    2525
    26 NewObjectListDefinition(NetworkSocket);
     26ObjectListDefinition(NetworkSocket);
    2727/**
    2828 * Default constructor

  • branches/new_class_id/src/lib/network/network_socket.h

    r9690 r9715  
    1717class NetworkSocket : public BaseObject
    1818{
    19   NewObjectListDeclaration(NetworkSocket);
     19  ObjectListDeclaration(NetworkSocket);
    2020  public:
    2121    NetworkSocket();

  • branches/new_class_id/src/lib/network/network_stream.cc

    r9709 r9715  
    5454#define PACKAGE_SIZE  256
    5555
    56 NewObjectListDefinition(NetworkStream);
     56ObjectListDefinition(NetworkStream);
    5757/**
    5858 * empty constructor

  • branches/new_class_id/src/lib/network/network_stream.h

    r9690 r9715  
    3333class NetworkStream : public DataStream
    3434{
    35   NewObjectListDeclaration(NetworkStream);
     35  ObjectListDeclaration(NetworkStream);
    3636  public:
    3737    NetworkStream();

  • branches/new_class_id/src/lib/network/player_stats.cc

    r9709 r9715  
    3232#include "class_id.h"
    3333
    34 NewObjectListDefinitionID(PlayerStats, CL_PLAYER_STATS);
     34ObjectListDefinitionID(PlayerStats, CL_PLAYER_STATS);
    3535CREATE_FACTORY(PlayerStats);
    3636
    … …  
    123123PlayerStats * PlayerStats::getStats( int userId )
    124124{
    125   for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
     125  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
    126126       it != PlayerStats::objectList().end();
    127127       ++it)
    … …  
    142142{
    143143  this->playable = NULL;
    144   for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
     144  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
    145145       it != Playable::objectList().end();
    146146       ++it)
    … …  
    266266  ScoreList result;
    267267
    268   for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
     268  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
    269269       it != PlayerStats::objectList().end();
    270270       ++it)

  • branches/new_class_id/src/lib/network/player_stats.h

    r9691 r9715  
    3636class PlayerStats : public Synchronizeable
    3737{
    38   NewObjectListDeclaration(PlayerStats);
     38  ObjectListDeclaration(PlayerStats);
    3939  public:
    4040    PlayerStats( const TiXmlElement* root = NULL );
    … …  
    5858
    5959    inline int getPlayableClassId(){ return playableClassId; }
    60     void setPlayableClassId( const NewClassID& classId ){ this->playableClassId = classId.id(); };
     60    void setPlayableClassId( const ClassID& classId ){ this->playableClassId = classId.id(); };
    6161
    6262    inline int getPlayableUniqueId(){ return playableUniqueId; }

  • branches/new_class_id/src/lib/network/proxy/network_settings.cc

    r9691 r9715  
    2727
    2828
    29 NewObjectListDefinition(NetworkSettings);
     29ObjectListDefinition(NetworkSettings);
    3030
    3131NetworkSettings* NetworkSettings::singletonRef = NULL;

  • branches/new_class_id/src/lib/network/proxy/network_settings.h

    r9690 r9715  
    2424class NetworkSettings : public BaseObject
    2525{
    26   NewObjectListDeclaration(NetworkSettings);
     26  ObjectListDeclaration(NetworkSettings);
    2727  public:
    2828    inline static NetworkSettings* getInstance() { if (!NetworkSettings::singletonRef) NetworkSettings::singletonRef = new NetworkSettings();

  • branches/new_class_id/src/lib/network/proxy/proxy_control.cc

    r9691 r9715  
    4040
    4141SHELL_COMMAND(forceReconnect, ProxyControl, forceReconnectionShell);
    42 NewObjectListDefinition(ProxyControl);
     42ObjectListDefinition(ProxyControl);
    4343
    4444/**

  • branches/new_class_id/src/lib/network/proxy/proxy_control.h

    r9690 r9715  
    3030class ProxyControl : public Synchronizeable
    3131{
    32   NewObjectListDeclaration(ProxyControl);
     32  ObjectListDeclaration(ProxyControl);
    3333  public:
    3434    inline static ProxyControl* getInstance() { if (!ProxyControl::singletonRef) ProxyControl::singletonRef = new ProxyControl();

  • branches/new_class_id/src/lib/network/server_socket.cc

    r9690 r9715  
    2323#include "server_socket.h"
    2424
    25 NewObjectListDefinition(ServerSocket);
     25ObjectListDefinition(ServerSocket);
    2626/**
    2727 * constructor

  • branches/new_class_id/src/lib/network/server_socket.h

    r9690 r9715  
    1919class ServerSocket : public BaseObject
    2020{
    21   NewObjectListDeclaration(ServerSocket);
     21  ObjectListDeclaration(ServerSocket);
    2222  public:
    2323    ServerSocket( int port);

  • branches/new_class_id/src/lib/network/shared_network_data.cc

    r9691 r9715  
    2525
    2626
    27 NewObjectListDefinition(SharedNetworkData);
     27ObjectListDefinition(SharedNetworkData);
    2828SharedNetworkData* SharedNetworkData::singletonRef = NULL;
    2929

  • branches/new_class_id/src/lib/network/shared_network_data.h

    r9690 r9715  
    2222class SharedNetworkData : public BaseObject
    2323{
    24   NewObjectListDeclaration(SharedNetworkData);
     24  ObjectListDeclaration(SharedNetworkData);
    2525  public:
    2626    inline static SharedNetworkData* getInstance() { if (!SharedNetworkData::singletonRef) SharedNetworkData::singletonRef = new SharedNetworkData();

  • branches/new_class_id/src/lib/network/synchronizeable.cc

    r9691 r9715  
    3232
    3333
    34 NewObjectListDefinition(Synchronizeable);
     34ObjectListDefinition(Synchronizeable);
    3535
    3636/**

  • branches/new_class_id/src/lib/network/synchronizeable.h

    r9690 r9715  
    4141class Synchronizeable : virtual public BaseObject
    4242{
    43   NewObjectListDeclaration(Synchronizeable);
     43  ObjectListDeclaration(Synchronizeable);
    4444
    4545  public:

  • branches/new_class_id/src/lib/network/tcp_server_socket.cc

    r9691 r9715  
    2626#include "debug.h"
    2727
    28 NewObjectListDefinition(TcpServerSocket);
     28ObjectListDefinition(TcpServerSocket);
    2929TcpServerSocket::TcpServerSocket( int port ) : ServerSocket( port )
    3030{

  • branches/new_class_id/src/lib/network/tcp_server_socket.h

    r9690 r9715  
    1919class TcpServerSocket : public ServerSocket
    2020{
    21   NewObjectListDeclaration(TcpServerSocket);
     21  ObjectListDeclaration(TcpServerSocket);
    2222  public:
    2323    TcpServerSocket( int port );

  • branches/new_class_id/src/lib/network/tcp_socket.cc

    r9691 r9715  
    3030#include "debug.h"
    3131
    32 NewObjectListDefinition(TcpSocket);
     32ObjectListDefinition(TcpSocket);
    3333/**
    3434 * Default constructor

  • branches/new_class_id/src/lib/network/tcp_socket.h

    r9690 r9715  
    4040class TcpSocket : public NetworkSocket
    4141{
    42   NewObjectListDeclaration(TcpSocket);
     42  ObjectListDeclaration(TcpSocket);
    4343  public:
    4444    TcpSocket();

  • branches/new_class_id/src/lib/network/udp_server_socket.cc

    r9690 r9715  
    1818
    1919
    20 NewObjectListDefinition(UdpServerSocket);
     20ObjectListDefinition(UdpServerSocket);
    2121/**
    2222 * constructor

  • branches/new_class_id/src/lib/network/udp_server_socket.h

    r9690 r9715  
    5050class UdpServerSocket : public ServerSocket
    5151{
    52   NewObjectListDeclaration(UdpServerSocket);
     52  ObjectListDeclaration(UdpServerSocket);
    5353  public:
    5454    UdpServerSocket( int port);

  • branches/new_class_id/src/lib/network/udp_socket.cc

    r9690 r9715  
    1818#include "debug.h"
    1919
    20 NewObjectListDefinition(UdpSocket);
     20ObjectListDefinition(UdpSocket);
    2121
    2222void UdpSocket::init( )

  • branches/new_class_id/src/lib/network/udp_socket.h

    r9690 r9715  
    2424class UdpSocket : public NetworkSocket
    2525{
    26   NewObjectListDeclaration(UdpSocket);
     26  ObjectListDeclaration(UdpSocket);
    2727  public:
    2828    UdpSocket();

  • branches/new_class_id/src/lib/particles/box_emitter.cc

    r9709 r9715  
    2626#include "class_id.h"
    2727
    28 NewObjectListDefinitionID(BoxEmitter, CL_BOX_EMITTER);
     28ObjectListDefinitionID(BoxEmitter, CL_BOX_EMITTER);
    2929CREATE_FACTORY(BoxEmitter);
    3030

  • branches/new_class_id/src/lib/particles/box_emitter.h

    r9686 r9715  
    1919class BoxEmitter : public ParticleEmitter
    2020{
    21   NewObjectListDeclaration(BoxEmitter);
     21  ObjectListDeclaration(BoxEmitter);
    2222  friend class ParticleSystem;
    2323public:

  • branches/new_class_id/src/lib/particles/dot_emitter.cc

    r9709 r9715  
    2727
    2828#include "class_id.h"
    29 NewObjectListDefinitionID(DotEmitter, CL_DOT_EMITTER);
     29ObjectListDefinitionID(DotEmitter, CL_DOT_EMITTER);
    3030CREATE_FACTORY(DotEmitter);
    3131

  • branches/new_class_id/src/lib/particles/dot_emitter.h

    r9686 r9715  
    1212class DotEmitter : public ParticleEmitter
    1313{
    14   NewObjectListDeclaration(DotEmitter);
     14  ObjectListDeclaration(DotEmitter);
    1515
    1616  friend class ParticleSystem;

  • branches/new_class_id/src/lib/particles/dot_particles.cc

    r9709 r9715  
    2626#include "class_id.h"
    2727
    28 NewObjectListDefinitionID(DotParticles, CL_DOT_PARTICLES);
     28ObjectListDefinitionID(DotParticles, CL_DOT_PARTICLES);
    2929CREATE_FACTORY(DotParticles);
    3030

  • branches/new_class_id/src/lib/particles/dot_particles.h

    r9686 r9715  
    1313class DotParticles : public ParticleSystem
    1414{
    15   NewObjectListDeclaration(DotParticles);
     15  ObjectListDeclaration(DotParticles);
    1616
    1717public:

  • branches/new_class_id/src/lib/particles/model_particles.cc

    r9709 r9715  
    2626#include "class_id.h"
    2727
    28 NewObjectListDefinitionID(ModelParticles, CL_MODEL_PARTICLES);
     28ObjectListDefinitionID(ModelParticles, CL_MODEL_PARTICLES);
    2929CREATE_FACTORY(ModelParticles);
    3030

  • branches/new_class_id/src/lib/particles/model_particles.h

    r9686 r9715  
    1313class ModelParticles : public ParticleSystem
    1414{
    15   NewObjectListDeclaration(ModelParticles);
     15  ObjectListDeclaration(ModelParticles);
    1616
    1717public:

  • branches/new_class_id/src/lib/particles/particle_emitter.cc

    r9686 r9715  
    2323#include "debug.h"
    2424
    25 NewObjectListDefinition(ParticleEmitter);
     25ObjectListDefinition(ParticleEmitter);
    2626
    2727/**

  • branches/new_class_id/src/lib/particles/particle_emitter.h

    r9686 r9715  
    2323class ParticleEmitter : public PNode
    2424{
    25   NewObjectListDeclaration(ParticleEmitter);
     25  ObjectListDeclaration(ParticleEmitter);
    2626  friend class ParticleSystem;
    2727public:

  • branches/new_class_id/src/lib/particles/particle_system.cc

    r9686 r9715  
    3232#include <algorithm>
    3333
    34 NewObjectListDefinition(ParticleSystem);
     34ObjectListDefinition(ParticleSystem);
    3535
    3636/**

  • branches/new_class_id/src/lib/particles/particle_system.h

    r9686 r9715  
    5656//! A class to handle ParticleSystems
    5757class ParticleSystem : public WorldEntity, public PhysicsInterface {
    58   NewObjectListDeclaration(ParticleSystem);
     58  ObjectListDeclaration(ParticleSystem);
    5959
    6060 public:

  • branches/new_class_id/src/lib/particles/plane_emitter.cc

    r9709 r9715  
    2626#include "class_id.h"
    2727
    28 NewObjectListDefinitionID(PlaneEmitter, CL_PLANE_EMITTER);
     28ObjectListDefinitionID(PlaneEmitter, CL_PLANE_EMITTER);
    2929CREATE_FACTORY(PlaneEmitter);
    3030

  • branches/new_class_id/src/lib/particles/plane_emitter.h

    r9686 r9715  
    2121class PlaneEmitter : public ParticleEmitter
    2222{
    23   NewObjectListDeclaration(PlaneEmitter);
     23  ObjectListDeclaration(PlaneEmitter);
    2424
    2525  friend class ParticleSystem;

  • branches/new_class_id/src/lib/particles/spark_particles.cc

    r9709 r9715  
    2626#include "class_id.h"
    2727
    28 NewObjectListDefinitionID(SparkParticles, CL_SPARK_PARTICLES);
     28ObjectListDefinitionID(SparkParticles, CL_SPARK_PARTICLES);
    2929CREATE_FACTORY(SparkParticles);
    3030

  • branches/new_class_id/src/lib/particles/spark_particles.h

    r9686 r9715  
    1313class SparkParticles : public ParticleSystem
    1414{
    15   NewObjectListDeclaration(SparkParticles);
     15  ObjectListDeclaration(SparkParticles);
    1616
    1717public:

  • branches/new_class_id/src/lib/particles/sprite_particles.cc

    r9709 r9715  
    2626#include "class_id.h"
    2727
    28 NewObjectListDefinitionID(SpriteParticles, CL_SPRITE_PARTICLES);
     28ObjectListDefinitionID(SpriteParticles, CL_SPRITE_PARTICLES);
    2929CREATE_FACTORY(SpriteParticles);
    3030

  • branches/new_class_id/src/lib/particles/sprite_particles.h

    r9686 r9715  
    1313class SpriteParticles : public ParticleSystem
    1414{
    15   NewObjectListDeclaration(SpriteParticles);
     15  ObjectListDeclaration(SpriteParticles);
    1616
    1717public:

  • branches/new_class_id/src/lib/physics/fields/field.cc

    r9686 r9715  
    2323#include "util/loading/load_param.h"
    2424
    25 NewObjectListDefinition(Field);
     25ObjectListDefinition(Field);
    2626
    2727/**

  • branches/new_class_id/src/lib/physics/fields/field.h

    r9686 r9715  
    3434class Field : public PNode
    3535{
    36   NewObjectListDeclaration(Field);
     36  ObjectListDeclaration(Field);
    3737 public:
    3838  Field();

  • branches/new_class_id/src/lib/physics/fields/gravity.cc

    r9709 r9715  
    2222
    2323#include "class_id.h"
    24 NewObjectListDefinitionID(Gravity, CL_FIELD_GRAVITY);
     24ObjectListDefinitionID(Gravity, CL_FIELD_GRAVITY);
    2525
    2626CREATE_FACTORY(Gravity);

  • branches/new_class_id/src/lib/physics/fields/gravity.h

    r9686 r9715  
    1616//! A class for ...
    1717class Gravity : public Field {
    18   NewObjectListDeclaration(Gravity);
     18  ObjectListDeclaration(Gravity);
    1919
    2020 public:

  • branches/new_class_id/src/lib/physics/fields/point_gravity.cc

    r9686 r9715  
    2121
    2222#include "class_id.h"
    23 NewObjectListDefinitionID(PointGravity, CL_FIELD_POINT_GRAVITY);
     23ObjectListDefinitionID(PointGravity, CL_FIELD_POINT_GRAVITY);
    2424
    2525

  • branches/new_class_id/src/lib/physics/fields/point_gravity.h

    r9686 r9715  
    1616//! A class for ...
    1717class PointGravity : public Field {
    18   NewObjectListDeclaration(PointGravity);
     18  ObjectListDeclaration(PointGravity);
    1919
    2020 public:

  • branches/new_class_id/src/lib/physics/fields/twirl.cc

    r9686 r9715  
    2121
    2222#include "class_id.h"
    23 NewObjectListDefinitionID(Twirl, CL_FIELD_TWIRL);
     23ObjectListDefinitionID(Twirl, CL_FIELD_TWIRL);
    2424
    2525

  • branches/new_class_id/src/lib/physics/fields/twirl.h

    r9686 r9715  
    1616//! A class for ...
    1717class Twirl : public Field {
    18   NewObjectListDeclaration(Twirl);
     18  ObjectListDeclaration(Twirl);
    1919
    2020 public:

  • branches/new_class_id/src/lib/physics/physics_connection.cc

    r9709 r9715  
    2828
    2929#include "class_id.h"
    30 NewObjectListDefinition(PhysicsConnection);
     30ObjectListDefinition(PhysicsConnection);
    3131CREATE_FACTORY(PhysicsConnection);
    3232/**

  • branches/new_class_id/src/lib/physics/physics_connection.h

    r9686 r9715  
    2727class PhysicsConnection : public BaseObject
    2828{
    29   NewObjectListDeclaration(PhysicsConnection);
     29  ObjectListDeclaration(PhysicsConnection);
    3030 public:
    3131  PhysicsConnection(PhysicsInterface* subject, Field* field);

  • branches/new_class_id/src/lib/physics/physics_engine.cc

    r9686 r9715  
    2424
    2525
    26 NewObjectListDefinition(PhysicsEngine);
     26ObjectListDefinition(PhysicsEngine);
    2727/**
    2828 * @brief standard constructor
    … …  
    222222  /* actually tick all the PhysicsInterfaces. Move the objects around */
    223223
    224   NewObjectList<PhysicsInterface>::const_iterator it;
     224  ObjectList<PhysicsInterface>::const_iterator it;
    225225  for (it = PhysicsInterface::objectList().begin();
    226226       it != PhysicsInterface::objectList().end();

  • branches/new_class_id/src/lib/physics/physics_engine.h

    r9686 r9715  
    2222class PhysicsEngine : public BaseObject
    2323{
    24   NewObjectListDeclaration(PhysicsEngine);
     24  ObjectListDeclaration(PhysicsEngine);
    2525public:
    2626  virtual ~PhysicsEngine();

  • branches/new_class_id/src/lib/physics/physics_interface.cc

    r9686 r9715  
    3131
    3232
    33 NewObjectListDefinition(PhysicsInterface);
     33ObjectListDefinition(PhysicsInterface);
    3434/**
    3535 * @brief standard constructor

  • branches/new_class_id/src/lib/physics/physics_interface.h

    r9686 r9715  
    2929class PhysicsInterface : virtual public BaseObject
    3030{
    31   NewObjectListDeclaration(PhysicsInterface);
     31  ObjectListDeclaration(PhysicsInterface);
    3232 public:
    3333  PhysicsInterface();

  • branches/new_class_id/src/lib/script_engine/script.cc

    r9713 r9715  
    2323#include "parser/tinyxml/tinyxml.h"
    2424
    25 NewObjectListDefinition(Script);
     25ObjectListDefinition(Script);
    2626
    2727CREATE_SCRIPTABLE_CLASS(Script, Script::classID(),
    … …  
    155155     }
    156156
    157      BaseObject* object = NewObjectListBase::getBaseObject(objectName, className);
     157     BaseObject* object = ObjectListBase::getBaseObject(objectName, className);
    158158    // printf(("%s is at %p \n",objectName.c_str(),object);
    159159     if (object != NULL && !objectIsAdded(objectName))

  • branches/new_class_id/src/lib/script_engine/script.h

    r9692 r9715  
    2222class Script : public BaseObject
    2323{
    24   NewObjectListDeclaration(Script);
     24  ObjectListDeclaration(Script);
    2525  public:
    2626    Script(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/lib/script_engine/script_class.cc

    r9699 r9715  
    1919#include <cassert>
    2020
    21 NewObjectListDefinition(ScriptClass);
     21ObjectListDefinition(ScriptClass);
    2222/**
    2323 * @brief standard constructor
    2424 * @todo this constructor is not jet implemented - do it
    2525*/
    26 ScriptClass::ScriptClass(const std::string& name, const NewClassID& classID, ScriptMethod* scriptMethods)
     26ScriptClass::ScriptClass(const std::string& name, const ClassID& classID, ScriptMethod* scriptMethods)
    2727    : BaseObject(name), _classID(classID)
    2828{

  • branches/new_class_id/src/lib/script_engine/script_class.h

    r9709 r9715  
    2525class ScriptClass : public BaseObject
    2626{
    27   NewObjectListDeclaration(ScriptClass);
     27  ObjectListDeclaration(ScriptClass);
    2828
    2929public:
    … …  
    3737
    3838protected:
    39   ScriptClass(const std::string& name, const NewClassID& classID, ScriptMethod* scriptMethods);
     39  ScriptClass(const std::string& name, const ClassID& classID, ScriptMethod* scriptMethods);
    4040
    4141private:
    42   NewClassID          _classID;
     42  ClassID          _classID;
    4343  ScriptMethod*       _scriptMethods;
    4444};
    … …  
    5151{
    5252public:
    53   tScriptClass(const std::string& name, NewClassID classID, ScriptMethod* scriptMethods)
     53  tScriptClass(const std::string& name, ClassID classID, ScriptMethod* scriptMethods)
    5454      : ScriptClass(name, classID, scriptMethods)
    5555  { }

  • branches/new_class_id/src/lib/script_engine/script_manager.cc

    r9699 r9715  
    9797Script* ScriptManager::getScriptByFile(const std::string& file)
    9898{
    99   for (NewObjectList<Script>::const_iterator it = Script::objectList().begin();
     99  for (ObjectList<Script>::const_iterator it = Script::objectList().begin();
    100100       it != Script::objectList().end();
    101101       ++it)

  • branches/new_class_id/src/lib/shell/shell.cc

    r9692 r9715  
    5454  ->completionPlugin(0, OrxShell::CompletorFileSystem(".ttf", "fonts/"));
    5555
    56   NewObjectListDefinition(Shell);
     56  ObjectListDefinition(Shell);
    5757
    5858  /**

  • branches/new_class_id/src/lib/shell/shell.h

    r9692 r9715  
    4848  class Shell : public Element2D, public EventListener
    4949  {
    50     NewObjectListDeclaration(Shell);
     50    ObjectListDeclaration(Shell);
    5151  public:
    5252    Shell();

  • branches/new_class_id/src/lib/shell/shell_command.cc

    r9709 r9715  
    2626namespace OrxShell
    2727{
    28   NewObjectListDefinition(ShellCommand);
     28  ObjectListDefinition(ShellCommand);
    2929  SHELL_COMMAND(debug, ShellCommandClass, help);
    3030
    … …  
    241241      return false;
    242242
    243     const NewObjectListBase* const objectList = NewObjectListBase::getObjectList(cmd->shellClass->getName());
     243    const ObjectListBase* const objectList = ObjectListBase::getObjectList(cmd->shellClass->getName());
    244244    if (objectList != NULL)
    245245    {
    246       NewObjectListBase::base_list list;
     246      ObjectListBase::base_list list;
    247247      objectList->getBaseObjectList(&list);
    248       NewObjectListBase::base_iterator it;
     248      ObjectListBase::base_iterator it;
    249249
    250250      // No Description given (only for speedup)

  • branches/new_class_id/src/lib/shell/shell_command.h

    r9692 r9715  
    5858  class ShellCommand : public BaseObject
    5959  {
    60     NewObjectListDeclaration(ShellCommand);
     60    ObjectListDeclaration(ShellCommand);
    6161
    6262    friend class ShellCommandClass;

  • branches/new_class_id/src/lib/shell/shell_command_class.cc

    r9697 r9715  
    2727namespace OrxShell
    2828{
    29   NewObjectListDefinition(ShellCommandClass);
     29  ObjectListDefinition(ShellCommandClass);
    3030
    3131  CmdClassList* ShellCommandClass::_commandClassList = NULL;

  • branches/new_class_id/src/lib/shell/shell_command_class.h

    r9697 r9715  
    2525  class ShellCommandClass : public BaseObject
    2626  {
    27     NewObjectListDeclaration(ShellCommandClass);
     27    ObjectListDeclaration(ShellCommandClass);
    2828
    2929    friend class ShellCommand;
    … …  
    3636    static void unregisterAllCommands();
    3737    static ShellCommandClass* getCommandClass(const std::string& className);
    38     NewClassID getClassID();
     38    ClassID getClassID();
    3939    static bool exists(const std::string& className);
    4040

  • branches/new_class_id/src/lib/shell/shell_completion.cc

    r9709 r9715  
    5050  bool ShellCompletion::autoComplete(std::string& input)
    5151  {
    52     NewClassID classID;
    53     const NewObjectListBase* objectList = NULL;      //< the list of Objects stored in classID's ClassList
     52    ClassID classID;
     53    const ObjectListBase* objectList = NULL;      //< the list of Objects stored in classID's ClassList
    5454    bool emptyComplete = false;                      //< if the completion input is empty string. e.g ""
    5555    long completeType = NullCompletion;              //< the Type we'd like to complete.
    … …  
    8484             (!emptyComplete && inputSplits.size() == 2))
    8585    {
    86       objectList = NewObjectListBase::getObjectList(inputSplits[0]);
     86      objectList = ObjectListBase::getObjectList(inputSplits[0]);
    8787      if (objectList != NULL)
    8888        classID = objectList->identity();
    … …  
    9595             (!emptyComplete && inputSplits.size() == 3))
    9696    {
    97       if (NewObjectListBase::getBaseObject(inputSplits[0], inputSplits[1]))
     97      if (ObjectListBase::getBaseObject(inputSplits[0], inputSplits[1]))
    9898        completeType |= FunctionCompletion;
    9999    }
    … …  
    133133   * @return true on success, false otherwise
    134134   */
    135   bool ShellCompletion::objectComplete(const std::string& objectBegin, const NewObjectListBase* objectList)
     135  bool ShellCompletion::objectComplete(const std::string& objectBegin, const ObjectListBase* objectList)
    136136  {
    137137    assert (objectList != NULL);
    … …  
    141141      type = ClassCompletion;
    142142
    143     NewObjectListBase::base_list list;
     143    ObjectListBase::base_list list;
    144144    objectList->getBaseObjectList(&list);
    145145

  • branches/new_class_id/src/lib/shell/shell_completion.h

    r9697 r9715  
    1616// FORWARD DECLARATION
    1717class BaseObject;
    18 class NewObjectListBase;
     18class ObjectListBase;
    1919
    2020namespace OrxShell
    … …  
    5454
    5555    private:
    56       bool objectComplete(const std::string& objectBegin, const NewObjectListBase* const objectList);
     56      bool objectComplete(const std::string& objectBegin, const ObjectListBase* const objectList);
    5757      bool commandComplete(const std::string& commandBegin, const std::string& className);
    5858      bool aliasComplete(const std::string& aliasBegin);

  • branches/new_class_id/src/lib/shell/shell_input.cc

    r9692 r9715  
    3232  ->setAlias("help");
    3333
    34   NewObjectListDefinition(ShellInput);
     34  ObjectListDefinition(ShellInput);
    3535
    3636  /**

  • branches/new_class_id/src/lib/shell/shell_input.h

    r9692 r9715  
    3030  class ShellInput : public Text,  public EventListener
    3131  {
    32     NewObjectListDeclaration(ShellInput);
     32    ObjectListDeclaration(ShellInput);
    3333
    3434  public:

  • branches/new_class_id/src/lib/sound/ogg_player.cc

    r9686 r9715  
    4949namespace OrxSound
    5050{
    51   NewObjectListDefinition(OggPlayer);
     51  ObjectListDefinition(OggPlayer);
    5252  /**
    5353   * initializes an Ogg-player from a file

  • branches/new_class_id/src/lib/sound/ogg_player.h

    r9686 r9715  
    2525  class OggPlayer : public BaseObject
    2626  {
    27     NewObjectListDeclaration(OggPlayer);
     27    ObjectListDeclaration(OggPlayer);
    2828
    2929  public:

  • branches/new_class_id/src/lib/sound/sound_buffer.cc

    r9686 r9715  
    3535namespace OrxSound
    3636{
    37   NewObjectListDefinition(SoundBuffer);
     37  ObjectListDefinition(SoundBuffer);
    3838  //////////////////
    3939  /* SOUND-BUFFER */

  • branches/new_class_id/src/lib/sound/sound_buffer.h

    r9686 r9715  
    1818  class SoundBuffer : public BaseObject
    1919  {
    20     NewObjectListDeclaration(SoundBuffer);
     20    ObjectListDeclaration(SoundBuffer);
    2121  public:
    2222    SoundBuffer(const std::string& fileName);

  • branches/new_class_id/src/lib/sound/sound_engine.cc

    r9686 r9715  
    2929namespace OrxSound
    3030{
    31   NewObjectListDefinition(SoundEngine);
     31  ObjectListDefinition(SoundEngine);
    3232  //////////////////
    3333  /* SOUND-ENGINE */
    … …  
    202202
    203203    // updating all the Sources positions
    204     NewObjectList<SoundSource>::const_iterator sourceIT;
     204    ObjectList<SoundSource>::const_iterator sourceIT;
    205205    for (sourceIT = SoundSource::objectList().begin();
    206206         sourceIT != SoundSource::objectList().end();

  • branches/new_class_id/src/lib/sound/sound_engine.h

    r9686 r9715  
    2727  class SoundEngine : public BaseObject
    2828  {
    29     NewObjectListDeclaration(SoundEngine);
     29    ObjectListDeclaration(SoundEngine);
    3030    public:
    3131    virtual ~SoundEngine();

  • branches/new_class_id/src/lib/sound/sound_source.cc

    r9686 r9715  
    2525namespace OrxSound
    2626{
    27   NewObjectListDefinition(SoundSource);
     27  ObjectListDefinition(SoundSource);
    2828  /**
    2929  * @brief creates a SoundSource at position sourceNode with the SoundBuffer buffer

  • branches/new_class_id/src/lib/sound/sound_source.h

    r9686 r9715  
    1818  class SoundSource : public BaseObject
    1919  {
    20     NewObjectListDeclaration(SoundSource);
     20    ObjectListDeclaration(SoundSource);
    2121  public:
    2222    SoundSource(const PNode* sourceNode = NULL, const SoundBuffer* buffer = NULL);

  • branches/new_class_id/src/lib/util/executor/executor.cc

    r9684 r9715  
    1919
    2020
    21 NewObjectListDefinition(Executor);
     21ObjectListDefinition(Executor);
    2222
    2323/**

  • branches/new_class_id/src/lib/util/executor/executor.h

    r9684 r9715  
    3838class Executor : public BaseObject
    3939{
    40   NewObjectListDeclaration(Executor);
     40  ObjectListDeclaration(Executor);
    4141  public:
    4242    virtual ~Executor();

  • branches/new_class_id/src/lib/util/loading/dynamic_loader.cc

    r9709 r9715  
    2424
    2525
    26 NewObjectListDefinition(DynamicLoader);
     26ObjectListDefinition(DynamicLoader);
    2727
    2828/**

  • branches/new_class_id/src/lib/util/loading/dynamic_loader.h

    r9684 r9715  
    1919class DynamicLoader : public Factory
    2020{
    21   NewObjectListDeclaration(DynamicLoader);
     21  ObjectListDeclaration(DynamicLoader);
    2222
    2323public:

  • branches/new_class_id/src/lib/util/loading/factory.cc

    r9712 r9715  
    1919//#include "shell_command.h"
    2020
    21 NewObjectListDefinition(Factory);
     21ObjectListDefinition(Factory);
    2222
    2323//SHELL_COMMAND(create, Factory, fabricate);
    … …  
    2828 * set everything to zero and define factoryName
    2929 */
    30 Factory::Factory (const NewClassID& classID)
     30Factory::Factory (const ClassID& classID)
    3131    : _classID(classID)
    3232{
    … …  
    140140 * @returns a new Object of Type classID on match, NULL otherwise
    141141 */
    142 BaseObject* Factory::fabricate(const NewClassID& classID)
     142BaseObject* Factory::fabricate(const ClassID& classID)
    143143{
    144144  if (Factory::_factoryList == NULL)

  • branches/new_class_id/src/lib/util/loading/factory.h

    r9709 r9715  
    3939class Factory : public BaseObject
    4040{
    41   NewObjectListDeclaration(Factory);
     41  ObjectListDeclaration(Factory);
    4242public:
    4343  virtual ~Factory ();
    … …  
    4646
    4747  static  BaseObject* fabricate(const std::string& className);
    48   static  BaseObject* fabricate(const NewClassID& classID);
     48  static  BaseObject* fabricate(const ClassID& classID);
    4949  static  BaseObject* fabricate(const TiXmlElement* root);
    5050
    … …  
    5252  bool operator==(int classID) const;
    5353  bool operator==(const std::string& className) const;
    54   bool operator==(const NewClassID& classID) const { return _classID == classID; };
     54  bool operator==(const ClassID& classID) const { return _classID == classID; };
    5555
    5656protected:
    57   Factory (const NewClassID& id);
     57  Factory (const ClassID& id);
    5858  virtual BaseObject* fabricateObject(const TiXmlElement* root = NULL) const = 0;
    5959
    … …  
    6262
    6363protected:
    64   const NewClassID              _classID;              //!< The Class-Identifyer of the Factory.
     64  const ClassID              _classID;              //!< The Class-Identifyer of the Factory.
    6565  static std::list<Factory*>*   _factoryList;          //!< List of Registered Factories
    6666};
    … …  
    7878   * @param classID the ID of the Class to be created.
    7979   */
    80   tFactory (const NewClassID& classID)
     80  tFactory (const ClassID& classID)
    8181      : Factory(classID)
    8282  {  }

  • branches/new_class_id/src/lib/util/loading/fast_factory.cc

    r9709 r9715  
    2222
    2323
    24 NewObjectListDefinition(FastFactory);
     24ObjectListDefinition(FastFactory);
    2525
    2626/**
    … …  
    3030 * @return a new FastFactory
    3131 */
    32 FastFactory::FastFactory (const NewClassID& classID, const std::string& fastFactoryName)
     32FastFactory::FastFactory (const ClassID& classID, const std::string& fastFactoryName)
    3333{
    3434  this->registerObject(this, FastFactory::_objectList);
    … …  
    9898 * @returns true if found, false otherwise.
    9999 */
    100 FastFactory* FastFactory::searchFastFactory(const NewClassID& classID)
     100FastFactory* FastFactory::searchFastFactory(const ClassID& classID)
    101101{
    102102  if (FastFactory::first == NULL)
    … …  
    229229 * @return the Object to resurrect, NULL if classID is not found.
    230230 */
    231 BaseObject* FastFactory::resurrect(const NewClassID& classID)
     231BaseObject* FastFactory::resurrect(const ClassID& classID)
    232232{
    233233  FastFactory* tmpFac = FastFactory::getFirst();

  • branches/new_class_id/src/lib/util/loading/fast_factory.h

    r9709 r9715  
    6060class FastFactory : public BaseObject
    6161{
    62   NewObjectListDeclaration(FastFactory);
     62  ObjectListDeclaration(FastFactory);
    6363
    6464public:
    … …  
    6868  // functions to push and pop elements of this class
    6969  BaseObject* resurrect();
    70   static BaseObject* resurrect(const NewClassID& classID);
     70  static BaseObject* resurrect(const ClassID& classID);
    7171  void kill(BaseObject* object);
    7272  static void kill(BaseObject* object, bool searchForFastFactory);
    … …  
    8080  inline static FastFactory* getFirst() { return FastFactory::first; };
    8181
    82   static FastFactory* searchFastFactory(const NewClassID& classID);
     82  static FastFactory* searchFastFactory(const ClassID& classID);
    8383  static FastFactory* searchFastFactory(const std::string& fastFactoryName);
    8484
    85   const NewClassID& getStoredID() const { return this->storedClassID; };
     85  const ClassID& getStoredID() const { return this->storedClassID; };
    8686
    8787protected:
    88   FastFactory (const NewClassID& classID, const std::string& fastFactoryName = "");
     88  FastFactory (const ClassID& classID, const std::string& fastFactoryName = "");
    8989
    9090  /** sets the Next factory in the list @param nextFactory the next factory */
    … …  
    100100
    101101protected:
    102   NewClassID            storedClassID;        //!< The classID of the specified class.
     102  ClassID            storedClassID;        //!< The classID of the specified class.
    103103  unsigned int          storedDeadObjects;    //!< How many dead objects are stored in this class
    104104
    … …  
    122122{
    123123public:
    124   static tFastFactory<T>* getFastFactory(const NewClassID& classID, const std::string& fastFactoryName);
     124  static tFastFactory<T>* getFastFactory(const ClassID& classID, const std::string& fastFactoryName);
    125125
    126126private:
    127   tFastFactory(const NewClassID& classID, const std::string& fastFactoryName);
     127  tFastFactory(const ClassID& classID, const std::string& fastFactoryName);
    128128
    129129  virtual void fabricate();
    … …  
    137137 */
    138138template<class T>
    139 tFastFactory<T>::tFastFactory(const NewClassID& classID, const std::string& fastFactoryName)
     139tFastFactory<T>::tFastFactory(const ClassID& classID, const std::string& fastFactoryName)
    140140    : FastFactory(classID, fastFactoryName)
    141141{}
    … …  
    148148 */
    149149template<class T>
    150 tFastFactory<T>* tFastFactory<T>::getFastFactory(const NewClassID& classID, const std::string& fastFactoryName)
     150tFastFactory<T>* tFastFactory<T>::getFastFactory(const ClassID& classID, const std::string& fastFactoryName)
    151151{
    152152  tFastFactory<T>* tmpFac = NULL;

  • branches/new_class_id/src/lib/util/loading/game_loader.cc

    r9684 r9715  
    2828#include "key_mapper.h"
    2929
    30 NewObjectListDefinition(GameLoader);
     30ObjectListDefinition(GameLoader);
    3131
    3232

  • branches/new_class_id/src/lib/util/loading/game_loader.h

    r9684 r9715  
    3838class GameLoader : public EventListener
    3939{
    40   NewObjectListDeclaration(GameLoader);
     40  ObjectListDeclaration(GameLoader);
    4141  public:
    4242  virtual ~GameLoader ();

  • branches/new_class_id/src/lib/util/loading/resource.h

    r9714 r9715  
    3737  {
    3838  public:
    39     Type(const NewClassID& classID) : _classID(classID) { };
     39    Type(const ClassID& classID) : _classID(classID) { };
    4040
    4141    void addExtension(const std::string& extension);
    4242
    4343  private:
    44     const NewClassID&                _classID;
     44    const ClassID&                _classID;
    4545    std::vector<std::string>      _resourcePaths;
    4646    std::vector<std::string>      _resourceSubPaths;
    … …  
    7373  unsigned int      referenceCount;    //!< How many times this Resource has been loaded.
    7474  /// TODO REMOVE THIS:   ResourceType      type;              //!< ResourceType of this Resource.
    75   ResourcePriority  prio;              //!< The Priority of this resource. (can only be increased, so noone else will delete this)
     75  Resource::Priority  prio;              //!< The Priority of this resource. (can only be increased, so noone else will delete this)
    7676
    7777  MultiType         param[3];          //!< The Parameters given to this Resource.

  • branches/new_class_id/src/lib/util/loading/resource_manager.cc

    r9684 r9715  
    5050#include <unistd.h>
    5151
    52 NewObjectListDefinition(ResourceManager);
     52ObjectListDefinition(ResourceManager);
    5353
    5454/**

  • branches/new_class_id/src/lib/util/loading/resource_manager.h

    r9684 r9715  
    9494class ResourceManager : public BaseObject
    9595{
    96   NewObjectListDeclaration(ResourceManager);
     96  ObjectListDeclaration(ResourceManager);
    9797public:
    9898  virtual ~ResourceManager();

  • branches/new_class_id/src/lib/util/preferences.cc

    r9684 r9715  
    2020#include "debug.h"
    2121
    22 NewObjectListDefinition(Preferences);
     22ObjectListDefinition(Preferences);
    2323
    2424/**

  • branches/new_class_id/src/lib/util/preferences.h

    r9684 r9715  
    2929//! A default singleton class.
    3030class Preferences : public BaseObject {
    31   NewObjectListDeclaration(Preferences);
     31  ObjectListDeclaration(Preferences);
    3232 public:
    3333   virtual ~Preferences(void);

  • branches/new_class_id/src/orxonox.cc

    r9709 r9715  
    9696REGISTER_ARG_ARG(  _, write_dict,  "compression", "writedict",    "write packets to DATA/dicts/newdict",               "numBytes" );
    9797
    98 NewObjectListDefinition(Orxonox);
     98ObjectListDefinition(Orxonox);
    9999
    100100/**
    … …  
    148148
    149149
    150   NewObjectListBase::debugAll(1);
     150  ObjectListBase::debugAll(1);
    151151
    152152  Preferences::getInstance()->save();

  • branches/new_class_id/src/orxonox.h

    r9709 r9715  
    1616*/
    1717class Orxonox : public BaseObject {
    18   NewObjectListDeclaration(Orxonox);
     18  ObjectListDeclaration(Orxonox);
    1919
    2020 public:

  • branches/new_class_id/src/story_entities/campaign.cc

    r9709 r9715  
    2727
    2828
    29 NewObjectListDefinition(Campaign);
     29ObjectListDefinition(Campaign);
    3030
    3131/**

  • branches/new_class_id/src/story_entities/campaign.h

    r9709 r9715  
    1818class Campaign : public StoryEntity
    1919{
    20   NewObjectListDeclaration(Campaign);
     20  ObjectListDeclaration(Campaign);
    2121  public:
    2222    Campaign( TiXmlElement* root);

  • branches/new_class_id/src/story_entities/campaign_data.cc

    r9709 r9715  
    2525
    2626
    27 NewObjectListDefinition(CampaignData);
     27ObjectListDefinition(CampaignData);
    2828
    2929/**

  • branches/new_class_id/src/story_entities/campaign_data.h

    r9709 r9715  
    1616class CampaignData : public DataTank
    1717{
    18   NewObjectListDeclaration(CampaignData);
     18  ObjectListDeclaration(CampaignData);
    1919
    2020public:

  • branches/new_class_id/src/story_entities/game_world.cc

    r9709 r9715  
    6262
    6363#include "script_class.h"
    64 NewObjectListDefinition(GameWorld);
     64ObjectListDefinition(GameWorld);
    6565CREATE_SCRIPTABLE_CLASS(GameWorld, GameWorld::classID(),
    6666                        addMethod("setPlaymode", ExecutorLua1<GameWorld,const std::string&>(&GameWorld::setPlaymode))
    … …  
    568568  MappedWater* mw;
    569569
    570   for (NewObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
     570  for (ObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
    571571       it != MappedWater::objectList().end();
    572572       ++it)
    … …  
    607607  MappedWater* mw;
    608608
    609   for (NewObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
     609  for (ObjectList<MappedWater>::const_iterator it = MappedWater::objectList().begin();
    610610       it != MappedWater::objectList().end();
    611611       ++it)

  • branches/new_class_id/src/story_entities/game_world.h

    r9709 r9715  
    3131class GameWorld : public StoryEntity
    3232{
    33   NewObjectListDeclaration(GameWorld);
     33  ObjectListDeclaration(GameWorld);
    3434
    3535public:

  • branches/new_class_id/src/story_entities/game_world_data.cc

    r9712 r9715  
    6161
    6262
    63 NewObjectListDefinition(GameWorldData);
     63ObjectListDefinition(GameWorldData);
    6464/**
    6565 * constructor of the GameWorldData

  • branches/new_class_id/src/story_entities/game_world_data.h

    r9709 r9715  
    3030class GameWorldData : public DataTank
    3131{
    32   NewObjectListDeclaration(GameWorldData);
     32  ObjectListDeclaration(GameWorldData);
    3333  public:
    3434    GameWorldData();

  • branches/new_class_id/src/story_entities/menu/game_menu.cc

    r9709 r9715  
    4444#include "class_id.h"
    4545//! This creates a Factory to fabricate a GameMenu
    46 NewObjectListDefinitionID(GameMenu, CL_GAME_MENU);
     46ObjectListDefinitionID(GameMenu, CL_GAME_MENU);
    4747CREATE_FACTORY(GameMenu);
    4848
    … …  
    192192
    193193      bool first = true;
    194       for(NewObjectList<StoryEntity>::const_iterator it = StoryEntity::objectList().begin();
     194      for(ObjectList<StoryEntity>::const_iterator it = StoryEntity::objectList().begin();
    195195          it != StoryEntity::objectList().end();
    196196          ++it)

  • branches/new_class_id/src/story_entities/menu/game_menu.h

    r9709 r9715  
    2222class GameMenu : virtual public GameWorld, virtual public EventListener
    2323{
    24   NewObjectListDeclaration(GameMenu);
     24  ObjectListDeclaration(GameMenu);
    2525  public:
    2626    GameMenu(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/story_entities/movie_loader.cc

    r9709 r9715  
    2626
    2727#include "class_id.h"
    28 NewObjectListDefinitionID(MovieLoader, CL_MOVIE_LOADER);
     28ObjectListDefinitionID(MovieLoader, CL_MOVIE_LOADER);
    2929CREATE_FACTORY(MovieLoader);
    3030

  • branches/new_class_id/src/story_entities/movie_loader.h

    r9709 r9715  
    1515class MovieLoader : public StoryEntity, virtual public EventListener
    1616{
    17   NewObjectListDeclaration(MovieLoader);
     17  ObjectListDeclaration(MovieLoader);
    1818  private:
    1919    MoviePlayer* movie_player;

  • branches/new_class_id/src/story_entities/multi_player_world.cc

    r9709 r9715  
    3838#include "class_id.h"
    3939//! This creates a Factory to fabricate a MultiPlayerWorld
    40 NewObjectListDefinitionID(MultiPlayerWorld, CL_MULTI_PLAYER_WORLD);
     40ObjectListDefinitionID(MultiPlayerWorld, CL_MULTI_PLAYER_WORLD);
    4141CREATE_FACTORY(MultiPlayerWorld);
    4242

  • branches/new_class_id/src/story_entities/multi_player_world.h

    r9709 r9715  
    2020 */
    2121class MultiPlayerWorld : public GameWorld {
    22   NewObjectListDeclaration(MultiPlayerWorld);
     22  ObjectListDeclaration(MultiPlayerWorld);
    2323 public:
    2424  MultiPlayerWorld (const TiXmlElement* root = NULL);

  • branches/new_class_id/src/story_entities/multi_player_world_data.cc

    r9709 r9715  
    311311  Playable* playable;
    312312
    313   for (NewObjectList<Playable>::const_iterator entity = Playable::objectList().begin();
     313  for (ObjectList<Playable>::const_iterator entity = Playable::objectList().begin();
    314314       entity != Playable::objectList().end();
    315315      ++entity)

  • branches/new_class_id/src/story_entities/single_player_world.cc

    r9709 r9715  
    3131#include "class_id.h"
    3232//! This creates a Factory to fabricate a SinglePlayerWorld
    33 NewObjectListDefinitionID(SinglePlayerWorld, CL_SINGLE_PLAYER_WORLD);
     33ObjectListDefinitionID(SinglePlayerWorld, CL_SINGLE_PLAYER_WORLD);
    3434CREATE_FACTORY(SinglePlayerWorld);
    3535

  • branches/new_class_id/src/story_entities/single_player_world.h

    r9709 r9715  
    2222class SinglePlayerWorld : public GameWorld
    2323{
    24   NewObjectListDeclaration(SinglePlayerWorld);
     24  ObjectListDeclaration(SinglePlayerWorld);
    2525
    2626  public:

  • branches/new_class_id/src/story_entities/story_entity.cc

    r9709 r9715  
    2727
    2828
    29 NewObjectListDefinition(StoryEntity);
     29ObjectListDefinition(StoryEntity);
    3030
    3131/**

  • branches/new_class_id/src/story_entities/story_entity.h

    r9709 r9715  
    2626class StoryEntity : virtual public BaseObject
    2727{
    28   NewObjectListDeclaration(StoryEntity);
     28  ObjectListDeclaration(StoryEntity);
    2929
    3030public:

  • branches/new_class_id/src/util/animation/animation.cc

    r9705 r9715  
    2020#include "animation_player.h"
    2121
    22 NewObjectListDefinition(Animation);
     22ObjectListDefinition(Animation);
    2323/**
    2424 *  creates a new Animation

  • branches/new_class_id/src/util/animation/animation.h

    r9705 r9715  
    7373class Animation : public BaseObject
    7474{
    75   NewObjectListDeclaration(Animation);
     75  ObjectListDeclaration(Animation);
    7676public:
    7777  virtual ~Animation();

  • branches/new_class_id/src/util/animation/animation_player.cc

    r9705 r9715  
    2222
    2323
    24 NewObjectListDefinition(AnimationPlayer);
     24ObjectListDefinition(AnimationPlayer);
    2525/**
    2626 *  standard constructor

  • branches/new_class_id/src/util/animation/animation_player.h

    r9705 r9715  
    3030class AnimationPlayer : public BaseObject
    3131{
    32   NewObjectListDeclaration(AnimationPlayer);
     32  ObjectListDeclaration(AnimationPlayer);
    3333
    3434public:

  • branches/new_class_id/src/util/game_rules.cc

    r9704 r9715  
    2828
    2929
    30 NewObjectListDefinition(GameRules);
     30ObjectListDefinition(GameRules);
    3131
    3232/**

  • branches/new_class_id/src/util/game_rules.h

    r9704 r9715  
    2323class GameRules : virtual public BaseObject
    2424{
    25   NewObjectListDeclaration(GameRules);
     25  ObjectListDeclaration(GameRules);
    2626
    2727  public:

  • branches/new_class_id/src/util/hud.cc

    r9703 r9715  
    3434#include "playable.h"
    3535
    36 NewObjectListDefinition(Hud);
     36ObjectListDefinition(Hud);
    3737/**
    3838 * standard constructor

  • branches/new_class_id/src/util/hud.h

    r9703 r9715  
    2323class Hud : public Element2D, public EventListener
    2424{
    25   NewObjectListDeclaration(Hud);
     25  ObjectListDeclaration(Hud);
    2626
    2727public:

  • branches/new_class_id/src/util/kill_target.cc

    r9709 r9715  
    2323
    2424#include "class_id.h"
    25 NewObjectListDefinitionID(KillTarget, CL_KILL_TARGET);
     25ObjectListDefinitionID(KillTarget, CL_KILL_TARGET);
    2626CREATE_FACTORY(KillTarget);
    2727

  • branches/new_class_id/src/util/kill_target.h

    r9705 r9715  
    1717class KillTarget : public MissionGoal
    1818{
    19   NewObjectListDeclaration(KillTarget);
     19  ObjectListDeclaration(KillTarget);
    2020
    2121  public:

  • branches/new_class_id/src/util/mission_goal.cc

    r9705 r9715  
    2424
    2525
    26 NewObjectListDefinition(MissionGoal);
     26ObjectListDefinition(MissionGoal);
    2727/**
    2828 * standard constructor

  • branches/new_class_id/src/util/mission_goal.h

    r9705 r9715  
    2626//! A class representing a mission goal
    2727class MissionGoal : public BaseObject {
    28   NewObjectListDeclaration(MissionGoal);
     28  ObjectListDeclaration(MissionGoal);
    2929
    3030 public:

  • branches/new_class_id/src/util/multiplayer_team_deathmatch.cc

    r9709 r9715  
    5050#include "class_id.h"
    5151
    52 NewObjectListDefinitionID(MultiplayerTeamDeathmatch, CL_MULTIPLAYER_TEAM_DEATHMATCH);
     52ObjectListDefinitionID(MultiplayerTeamDeathmatch, CL_MULTIPLAYER_TEAM_DEATHMATCH);
    5353CREATE_FACTORY(MultiplayerTeamDeathmatch);
    5454/**
    … …  
    301301}
    302302
    303 NewClassID MultiplayerTeamDeathmatch::getPlayableClassId( int userId, int team )
     303ClassID MultiplayerTeamDeathmatch::getPlayableClassId( int userId, int team )
    304304{
    305305  if ( team == TEAM_NOTEAM || team == TEAM_SPECTATOR )
    306     return NewObjectListBase::retrieveIdentity("Spectator");
     306    return ObjectListBase::retrieveIdentity("Spectator");
    307307
    308308  if ( team == 0 || team == 1 )
    309     return NewObjectListBase::retrieveIdentity("TurbineHover");
     309    return ObjectListBase::retrieveIdentity("TurbineHover");
    310310
    311311  assert( false );
    … …  
    313313
    314314
    315 std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, const NewClassID& classId )
     315std::string MultiplayerTeamDeathmatch::getPlayableModelFileName( int userId, int team, const ClassID& classId )
    316316{
    317317  if (classId == CL_TURBINE_HOVER)
    … …  
    325325}
    326326
    327 std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId )
     327std::string MultiplayerTeamDeathmatch::getPlayableModelTextureFileName( int userId, int team, const ClassID& classId )
    328328{
    329329  if ( classId == CL_FPS_PLAYER )
    … …  
    338338}
    339339
    340 float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, const NewClassID& classId )
    341 {
    342   if ( classId == NewObjectListBase::retrieveIdentity(CL_FPS_PLAYER))
     340float MultiplayerTeamDeathmatch::getPlayableScale( int userId, int team, const ClassID& classId )
     341{
     342  if ( classId == ObjectListBase::retrieveIdentity(CL_FPS_PLAYER))
    343343  {
    344344    return 10.0f;
    … …  
    358358    teamScore[i] = 0;
    359359
    360   for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
     360  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
    361361       it != PlayerStats::objectList().end();
    362362       ++it)
    … …  
    382382    playersInTeam[i] = 0;
    383383
    384   for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
     384  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
    385385       it != PlayerStats::objectList().end();
    386386       ++it)
    … …  
    442442void MultiplayerTeamDeathmatch::handleTeamChanges( )
    443443{
    444   for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
     444  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
    445445       it != PlayerStats::objectList().end();
    446446       ++it)
    … …  
    458458
    459459  //now serve player who want join a random team
    460   for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
     460  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
    461461       it != PlayerStats::objectList().end();
    462462       ++it)
    … …  
    491491
    492492
    493   NewClassID       playableClassId  = getPlayableClassId( userId, stats.getPreferedTeamId() );
     493  ClassID       playableClassId  = getPlayableClassId( userId, stats.getPreferedTeamId() );
    494494  std::string   playableModel    = getPlayableModelFileName( userId, stats.getPreferedTeamId(), playableClassId );
    495495  std::string   playableTexture  = getPlayableModelTextureFileName( userId, stats.getPreferedTeamId(), playableClassId );
    … …  
    813813  std::vector<SpawningPoint*> spList;
    814814
    815   for (NewObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
     815  for (ObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
    816816       it != SpawningPoint::objectList().end();
    817817       ++it)
    … …  
    825825  if ( spList.size() == 0 )
    826826  {
    827     for (NewObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
     827    for (ObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
    828828         it != SpawningPoint::objectList().end();
    829829         ++it)

  • branches/new_class_id/src/util/multiplayer_team_deathmatch.h

    r9704 r9715  
    3030class MultiplayerTeamDeathmatch : public NetworkGameRules, public EventListener
    3131{
    32   NewObjectListDeclaration(MultiplayerTeamDeathmatch);
     32  ObjectListDeclaration(MultiplayerTeamDeathmatch);
    3333
    3434  public:
    … …  
    3939
    4040    virtual int getTeamForNewUser();
    41     virtual NewClassID getPlayableClassId( int userId, int team );
    42     virtual std::string getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId );
    43     virtual std::string getPlayableModelFileName( int userId, int team, const NewClassID& classId );
    44     virtual float getPlayableScale( int userId, int team, const NewClassID& classId );
     41    virtual ClassID getPlayableClassId( int userId, int team );
     42    virtual std::string getPlayableModelTextureFileName( int userId, int team, const ClassID& classId );
     43    virtual std::string getPlayableModelFileName( int userId, int team, const ClassID& classId );
     44    virtual float getPlayableScale( int userId, int team, const ClassID& classId );
    4545
    4646    virtual void registerSpawn( WorldEntity * we );

  • branches/new_class_id/src/util/network_game_rules.cc

    r9704 r9715  
    2222
    2323
    24 NewObjectListDefinition(NetworkGameRules);
     24ObjectListDefinition(NetworkGameRules);
    2525
    2626/**
    … …  
    4141
    4242
    43 std::string NetworkGameRules::getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId )
     43std::string NetworkGameRules::getPlayableModelTextureFileName( int userId, int team, const ClassID& classId )
    4444{
    4545  return "";
    4646}
    4747
    48 std::string NetworkGameRules::getPlayableModelFileName( int uesrId, int team, const NewClassID& classId )
     48std::string NetworkGameRules::getPlayableModelFileName( int uesrId, int team, const ClassID& classId )
    4949{
    5050  return "models/ships/reap_#.obj";
    5151}
    5252
    53 NewClassID NetworkGameRules::getPlayableClassId( int userId, int team )
     53ClassID NetworkGameRules::getPlayableClassId( int userId, int team )
    5454{
    55   const NewObjectListBase* objList = NewObjectListBase::getObjectList("SpaceShip");
     55  const ObjectListBase* objList = ObjectListBase::getObjectList("SpaceShip");
    5656  if (objList != NULL)
    5757    return objList->identity();
    5858  else
    59     return NewClassID();
     59    return ClassID();
    6060}
    6161
    … …  
    7272
    7373
    74 float NetworkGameRules::getPlayableScale( int userId, int team, const NewClassID& classId )
     74float NetworkGameRules::getPlayableScale( int userId, int team, const ClassID& classId )
    7575{
    7676  return 1.0f;

  • branches/new_class_id/src/util/network_game_rules.h

    r9704 r9715  
    1515class NetworkGameRules : public GameRules
    1616{
    17   NewObjectListDeclaration(NetworkGameRules);
     17  ObjectListDeclaration(NetworkGameRules);
    1818
    1919  public:
    … …  
    2222
    2323    virtual int getTeamForNewUser();
    24     virtual NewClassID getPlayableClassId( int userId, int team );
    25     virtual std::string getPlayableModelFileName( int userId, int team, const NewClassID& classId );
    26     virtual std::string getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId );
    27     virtual float getPlayableScale( int userId, int team, const NewClassID& classId );
     24    virtual ClassID getPlayableClassId( int userId, int team );
     25    virtual std::string getPlayableModelFileName( int userId, int team, const ClassID& classId );
     26    virtual std::string getPlayableModelTextureFileName( int userId, int team, const ClassID& classId );
     27    virtual float getPlayableScale( int userId, int team, const ClassID& classId );
    2828
    2929    virtual PlayerStats * getNewPlayerStats( int userId ){ return new PlayerStats( userId ); }

  • branches/new_class_id/src/util/object_manager.cc

    r9703 r9715  
    2929    ->defaultValues("", 0);
    3030
    31 NewObjectListDefinition(ObjectManager);
     31ObjectListDefinition(ObjectManager);
    3232/**
    3333 * @brief standard constructor
    … …  
    112112 */
    113113  /*
    114 void ObjectManager::distanceFromObject(EntityList& entities, const PNode& center, float radius, const NewClassID& classID)
     114void ObjectManager::distanceFromObject(EntityList& entities, const PNode& center, float radius, const ClassID& classID)
    115115{
    116116  TODO FIXME

  • branches/new_class_id/src/util/object_manager.h

    r9703 r9715  
    7373class ObjectManager : public BaseObject
    7474{
    75   NewObjectListDeclaration(ObjectManager);
     75  ObjectListDeclaration(ObjectManager);
    7676public:
    7777  typedef std::list<WorldEntity*> EntityList;      //!< A type definition to make it easy to use EntityLists.
    … …  
    9191  const EntityList& getEntityList(OM_LIST listNumber) const { return this->entityLists[listNumber]; }
    9292
    93   template <class T> static void distanceFromObject(EntityList& entities, const PNode& center, float radius, NewObjectList<T>& list);
     93  template <class T> static void distanceFromObject(EntityList& entities, const PNode& center, float radius, ObjectList<T>& list);
    9494
    9595  void debug(OM_LIST omList, unsigned int level = 0) const;

  • branches/new_class_id/src/util/singleplayer_shootemup.cc

    r9709 r9715  
    2626
    2727#include "class_id.h"
    28 NewObjectListDefinitionID(SingleplayerShootemup, CL_SINGLEPLAYER_SHOOTEMUP);
     28ObjectListDefinitionID(SingleplayerShootemup, CL_SINGLEPLAYER_SHOOTEMUP);
    2929CREATE_FACTORY(SingleplayerShootemup);
    3030

  • branches/new_class_id/src/util/singleplayer_shootemup.h

    r9705 r9715  
    1818class SingleplayerShootemup : public GameRules
    1919{
    20   NewObjectListDeclaration(SingleplayerShootemup);
     20  ObjectListDeclaration(SingleplayerShootemup);
    2121  public:
    2222    SingleplayerShootemup(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/util/track/pilot_node.cc

    r9705 r9715  
    2424
    2525
    26 NewObjectListDefinition(PilotNode);
     26ObjectListDefinition(PilotNode);
    2727/**
    2828 *  standard constructor

  • branches/new_class_id/src/util/track/pilot_node.h

    r9705 r9715  
    1515//! The PilotNode is a node that enables the is driven by the Mouse
    1616class PilotNode : public WorldEntity, public EventListener {
    17   NewObjectListDeclaration(PilotNode);
     17  ObjectListDeclaration(PilotNode);
    1818
    1919 public:

  • branches/new_class_id/src/world_entities/bsp_entity.cc

    r9709 r9715  
    1919
    2020#include "class_id.h"
    21 NewObjectListDefinitionID(BspEntity, CL_BSP_ENTITY);
     21ObjectListDefinitionID(BspEntity, CL_BSP_ENTITY);
    2222CREATE_FACTORY(BspEntity);
    2323

  • branches/new_class_id/src/world_entities/bsp_entity.h

    r9687 r9715  
    1818class BspEntity : public WorldEntity
    1919{
    20   NewObjectListDeclaration(BspEntity);
     20  ObjectListDeclaration(BspEntity);
    2121 public:
    2222  BspEntity(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/world_entities/camera.cc

    r9705 r9715  
    1919#include "glincl.h"
    2020
    21 NewObjectListDefinition(Camera);
     21ObjectListDefinition(Camera);
    2222
    2323/**
    … …  
    223223///////////////////
    224224
    225 NewObjectListDefinition(CameraTarget);
     225ObjectListDefinition(CameraTarget);
    226226CameraTarget::CameraTarget()
    227227{

  • branches/new_class_id/src/world_entities/camera.h

    r9705 r9715  
    2222class Camera : public PNode, public EventListener
    2323{
    24   NewObjectListDeclaration(Camera);
     24  ObjectListDeclaration(Camera);
    2525public:
    2626  //! an enumerator for different types of view
    … …  
    8585{
    8686  friend class Camera;             //! The CameraTarget is a friend of Camera. noone else needs a CameraTarget, so noone else can create it.
    87   NewObjectListDeclaration(CameraTarget);
     87  ObjectListDeclaration(CameraTarget);
    8888
    8989private:

  • branches/new_class_id/src/world_entities/character_attributes.cc

    r9709 r9715  
    2020
    2121
    22 NewObjectListDefinition(CharacterAttributes);
     22ObjectListDefinition(CharacterAttributes);
    2323
    2424

  • branches/new_class_id/src/world_entities/character_attributes.h

    r9709 r9715  
    1515*/
    1616class CharacterAttributes : public BaseObject {
    17     NewObjectListDeclaration(CharacterAttributes);
     17    ObjectListDeclaration(CharacterAttributes);
    1818
    1919 public:

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

    r9709 r9715  
    4242
    4343#include "class_id.h"
    44 NewObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
     44ObjectListDefinitionID(FPSPlayer, CL_FPS_PLAYER);
    4545CREATE_FACTORY(FPSPlayer);
    4646

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

    r9709 r9715  
    1616class FPSPlayer : public Playable
    1717{
    18   NewObjectListDeclaration(FPSPlayer);
     18  ObjectListDeclaration(FPSPlayer);
    1919
    2020  public:

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

    r9709 r9715  
    3838
    3939#include "class_id.h"
    40 NewObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
     40ObjectListDefinitionID(MD2Creature, CL_MD2_CREATURE);
    4141CREATE_FACTORY(MD2Creature);
    4242

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

    r9709 r9715  
    1616class MD2Creature : public Playable
    1717{
    18   NewObjectListDeclaration(MD2Creature);
     18  ObjectListDeclaration(MD2Creature);
    1919
    2020  public:

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

    r9709 r9715  
    2727
    2828#include "class_id.h"
    29 NewObjectListDefinitionID(Billboard, CL_BILLBOARD);
     29ObjectListDefinitionID(Billboard, CL_BILLBOARD);
    3030CREATE_FACTORY(Billboard);
    3131

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

    r9707 r9715  
    1313class Billboard : public WorldEntity
    1414{
    15   NewObjectListDeclaration(Billboard);
     15  ObjectListDeclaration(Billboard);
    1616  public:
    1717    Billboard(const TiXmlElement* root = NULL);

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

    r9709 r9715  
    2828
    2929#include "class_id.h"
    30 NewObjectListDefinitionID(Explosion, CL_EXPLOSION);
     30ObjectListDefinitionID(Explosion, CL_EXPLOSION);
    3131CREATE_FAST_FACTORY_STATIC(Explosion);
    3232

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

    r9707 r9715  
    1515class Explosion : public WorldEntity
    1616{
    17   NewObjectListDeclaration(Explosion);
     17  ObjectListDeclaration(Explosion);
    1818  public:
    1919    static void explode (PNode* position, const Vector& size);

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

    r9709 r9715  
    2626
    2727#include "class_id.h"
    28 NewObjectListDefinitionID(LightningBolt, CL_LIGHTNING_BOLT);
     28ObjectListDefinitionID(LightningBolt, CL_LIGHTNING_BOLT);
    2929CREATE_FACTORY(LightningBolt);
    3030

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

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

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

    r9709 r9715  
    3131
    3232#include "class_id.h"
    33 NewObjectListDefinitionID(ImageEntity, CL_IMAGE_ENTITY);
     33ObjectListDefinitionID(ImageEntity, CL_IMAGE_ENTITY);
    3434CREATE_FACTORY(ImageEntity);
    3535

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

    r9709 r9715  
    2121//! A class that enables the
    2222class ImageEntity : public PNode, public Element2D {
    23   NewObjectListDeclaration(ImageEntity);
     23  ObjectListDeclaration(ImageEntity);
    2424
    2525 public:

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

    r9709 r9715  
    2828
    2929#include "class_id.h"
    30 NewObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
     30ObjectListDefinitionID(TextElement, CL_TEXT_ELEMENT);
    3131CREATE_FACTORY(TextElement);
    3232

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

    r9709 r9715  
    2121//! A class that enables the
    2222class TextElement : public Text {
    23   NewObjectListDeclaration(TextElement);
     23  ObjectListDeclaration(TextElement);
    2424
    2525 public:

  • branches/new_class_id/src/world_entities/environment.cc

    r9709 r9715  
    2727
    2828#include "class_id.h"
    29 NewObjectListDefinitionID(Environment, CL_ENVIRONMENT);
     29ObjectListDefinitionID(Environment, CL_ENVIRONMENT);
    3030CREATE_FACTORY(Environment);
    3131

  • branches/new_class_id/src/world_entities/environment.h

    r9709 r9715  
    1616class Environment : public WorldEntity
    1717{
    18   NewObjectListDeclaration(Environment);
     18  ObjectListDeclaration(Environment);
    1919
    2020 public:

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

    r9709 r9715  
    2424
    2525#include "class_id.h"
    26 NewObjectListDefinitionID(Building, CL_BUILDING);
     26ObjectListDefinitionID(Building, CL_BUILDING);
    2727CREATE_FACTORY(Building);
    2828

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

    r9709 r9715  
    1515class Building : public WorldEntity
    1616{
    17   NewObjectListDeclaration(Building);
     17  ObjectListDeclaration(Building);
    1818  public:
    1919  Building(const TiXmlElement* root);

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

    r9709 r9715  
    2626
    2727#include "class_id.h"
    28 NewObjectListDefinitionID(MappedWater, CL_MAPPED_WATER);
     28ObjectListDefinitionID(MappedWater, CL_MAPPED_WATER);
    2929CREATE_FACTORY(MappedWater);
    3030

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

    r9709 r9715  
    3535class MappedWater : public WorldEntity
    3636{
    37   NewObjectListDeclaration(MappedWater);
     37  ObjectListDeclaration(MappedWater);
    3838public:
    3939  MappedWater(const TiXmlElement* root = NULL);

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

    r9709 r9715  
    2424
    2525#include "class_id.h"
    26 NewObjectListDefinitionID(ModelEntity, CL_MODEL_ENTITY);
     26ObjectListDefinitionID(ModelEntity, CL_MODEL_ENTITY);
    2727CREATE_FACTORY(ModelEntity);
    2828

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

    r9709 r9715  
    1515class ModelEntity : public WorldEntity
    1616{
    17   NewObjectListDeclaration(ModelEntity);
     17  ObjectListDeclaration(ModelEntity);
    1818 public:
    1919  ModelEntity(const TiXmlElement* root);

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

    r9709 r9715  
    3434
    3535#include "class_id.h"
    36 NewObjectListDefinitionID(Water, CL_WATER);
     36ObjectListDefinitionID(Water, CL_WATER);
    3737CREATE_FACTORY(Water);
    3838

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

    r9709 r9715  
    2222class Water : public WorldEntity
    2323{
    24   NewObjectListDeclaration(Water);
     24  ObjectListDeclaration(Water);
    2525  public:
    2626   Water(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/world_entities/extendable.cc

    r9685 r9715  
    11#include "extendable.h"
    22
    3 NewObjectListDefinition(Extendable);
     3ObjectListDefinition(Extendable);

  • branches/new_class_id/src/world_entities/extendable.h

    r9685 r9715  
    1616//! A class for Extendable Entities
    1717class Extendable : virtual public BaseObject {
    18   NewObjectListDeclaration(Extendable);
     18  ObjectListDeclaration(Extendable);
    1919
    2020  public:

  • branches/new_class_id/src/world_entities/movie_entity.cc

    r9709 r9715  
    2222
    2323#include "class_id.h"
    24 NewObjectListDefinitionID(MovieEntity, CL_MOVIE_ENTITY);
     24ObjectListDefinitionID(MovieEntity, CL_MOVIE_ENTITY);
    2525CREATE_FACTORY(MovieEntity);
    2626

  • branches/new_class_id/src/world_entities/movie_entity.h

    r9709 r9715  
    1414class MovieEntity : public WorldEntity
    1515{
    16   NewObjectListDeclaration(MovieEntity);
     16  ObjectListDeclaration(MovieEntity);
    1717  private:
    1818    MediaContainer* media_container;

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

    r9709 r9715  
    3434
    3535#include "class_id.h"
    36 NewObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
     36ObjectListDefinitionID(AttractorMine, CL_ATTRACTOR_MINE);
    3737CREATE_FACTORY(AttractorMine);
    3838#include "script_class.h"

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

    r9709 r9715  
    99
    1010class AttractorMine : public NPC {
    11   NewObjectListDeclaration(AttractorMine);
     11  ObjectListDeclaration(AttractorMine);
    1212
    1313 public:

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

    r9709 r9715  
    2727
    2828#include "class_id.h"
    29 NewObjectListDefinitionID(Door, CL_DOOR);
     29ObjectListDefinitionID(Door, CL_DOOR);
    3030CREATE_FACTORY(Door);
    3131
    … …  
    159159  float distance;
    160160
    161   for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
     161  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
    162162       it != Playable::objectList().end();
    163163       ++it)
    … …  
    173173
    174174
    175   for (NewObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
     175  for (ObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
    176176       it != GenericNPC::objectList().end();
    177177       ++it)

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

    r9709 r9715  
    2121class Door : public WorldEntity
    2222{
    23   NewObjectListDeclaration(Door);
     23  ObjectListDeclaration(Door);
    2424
    2525  public:

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

    r9709 r9715  
    3232
    3333#include "class_id.h"
    34 NewObjectListDefinitionID(Gate, CL_GATE);
     34ObjectListDefinitionID(Gate, CL_GATE);
    3535CREATE_FACTORY(Gate);
    3636
    … …  
    200200
    201201  // for all players
    202   for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
     202  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
    203203       it != Playable::objectList().end();
    204204       ++it)
    … …  
    212212
    213213
    214   for (NewObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
     214  for (ObjectList<GenericNPC>::const_iterator it = GenericNPC::objectList().begin();
    215215       it != GenericNPC::objectList().end();
    216216       ++it)

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

    r9709 r9715  
    2222class Gate : public WorldEntity
    2323{
    24   NewObjectListDeclaration(Gate);
     24  ObjectListDeclaration(Gate);
    2525
    2626  public:

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

    r9709 r9715  
    3333
    3434#include "class_id.h"
    35 NewObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
     35ObjectListDefinitionID(GenericNPC, CL_GENERIC_NPC);
    3636CREATE_FACTORY(GenericNPC);
    3737

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

    r9709 r9715  
    2525class GenericNPC : public NPC
    2626{
    27   NewObjectListDeclaration(GenericNPC);
     27  ObjectListDeclaration(GenericNPC);
    2828
    2929

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

    r9709 r9715  
    3131#include "class_id.h"
    3232
    33 NewObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
     33ObjectListDefinitionID(GroundTurret, CL_GROUND_TURRET);
    3434CREATE_FACTORY(GroundTurret);
    3535

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

    r9709 r9715  
    1414class GroundTurret : public NPC
    1515{
    16   NewObjectListDeclaration(GroundTurret);
     16  ObjectListDeclaration(GroundTurret);
    1717
    1818public:

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

    r9709 r9715  
    3232
    3333#include "class_id.h"
    34 NewObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
     34ObjectListDefinitionID(NetworkTurret, CL_NETWORK_TURRET);
    3535CREATE_FACTORY(NetworkTurret);
    3636

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

    r9709 r9715  
    1414class NetworkTurret : public NPC
    1515{
    16   NewObjectListDeclaration(NetworkTurret);
     16  ObjectListDeclaration(NetworkTurret);
    1717public:
    1818  NetworkTurret(const TiXmlElement* root = NULL);

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

    r9705 r9715  
    2020#include "npc.h"
    2121
    22 NewObjectListDefinition(NPC);
     22ObjectListDefinition(NPC);
    2323
    2424NPC::NPC(const TiXmlElement* root)

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

    r9705 r9715  
    88
    99class NPC : public WorldEntity {
    10   NewObjectListDeclaration(NPC);
     10  ObjectListDeclaration(NPC);
    1111 public:
    1212   NPC (const TiXmlElement* root);

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

    r9709 r9715  
    3131
    3232#include "class_id.h"
    33 NewObjectListDefinitionID(NPC2, CL_NPC_TEST2);
     33ObjectListDefinitionID(NPC2, CL_NPC_TEST2);
    3434CREATE_FACTORY(NPC2);
    3535

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

    r9707 r9715  
    99
    1010class NPC2 : public NPC {
    11   NewObjectListDeclaration(NPC2);
     11  ObjectListDeclaration(NPC2);
    1212
    1313 public:

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

    r9705 r9715  
    2525#include "power_ups/laser_power_up.h"
    2626
    27 NewObjectListDefinition(NPCTest1);
     27ObjectListDefinition(NPCTest1);
    2828
    2929NPCTest1::NPCTest1()

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

    r9705 r9715  
    88
    99class NPCTest1 : public NPC {
    10   NewObjectListDeclaration(NPCTest1);
     10  ObjectListDeclaration(NPCTest1);
    1111 public:
    1212  NPCTest1 ();

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

    r9709 r9715  
    2727
    2828#include "class_id.h"
    29 NewObjectListDefinitionID(RepairStation, CL_DOOR +1 );
     29ObjectListDefinitionID(RepairStation, CL_DOOR +1 );
    3030CREATE_FACTORY(RepairStation);
    3131

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

    r9709 r9715  
    2727class RepairStation : public WorldEntity
    2828{
    29   NewObjectListDeclaration(RepairStation);
     29  ObjectListDeclaration(RepairStation);
    3030  public:
    3131    RepairStation ();

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

    r9712 r9715  
    3030
    3131#include "class_id.h"
    32 NewObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
     32ObjectListDefinitionID(SpaceTurret, CL_SPACE_TURRET);
    3333CREATE_FACTORY(SpaceTurret);
    3434

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

    r9709 r9715  
    1818class SpaceTurret : public NPC
    1919{
    20   NewObjectListDeclaration(SpaceTurret);
     20  ObjectListDeclaration(SpaceTurret);
    2121
    2222public:

  • branches/new_class_id/src/world_entities/planet.cc

    r9709 r9715  
    3333
    3434#include "class_id.h"
    35 NewObjectListDefinitionID(Planet, CL_PLANET);
     35ObjectListDefinitionID(Planet, CL_PLANET);
    3636CREATE_FACTORY(Planet);
    3737

  • branches/new_class_id/src/world_entities/planet.h

    r9709 r9715  
    1616class Planet : public WorldEntity
    1717{
    18   NewObjectListDeclaration(Planet);
     18  ObjectListDeclaration(Planet);
    1919
    2020 public:

  • branches/new_class_id/src/world_entities/playable.cc

    r9705 r9715  
    4141SHELL_COMMAND_STATIC(orxoWeapon, Playable, Playable::addSomeWeapons_CHEAT)
    4242  ->setAlias("orxoWeapon");
    43 NewObjectListDefinition(Playable);
     43ObjectListDefinition(Playable);
    4444
    4545Playable::Playable()

  • branches/new_class_id/src/world_entities/playable.h

    r9691 r9715  
    2727class Playable : public WorldEntity, public Extendable
    2828{
    29   NewObjectListDeclaration(Playable);
     29  ObjectListDeclaration(Playable);
    3030public:
    3131  //! Defines the Playmode of an Entity.

  • branches/new_class_id/src/world_entities/player.cc

    r9705 r9715  
    2424#include "debug.h"
    2525
    26 NewObjectListDefinition(Player);
     26ObjectListDefinition(Player);
    2727/**
    2828 * creates a new Player
    … …  
    101101{
    102102  /// FIXME this should be in the ObjectManager
    103   for (NewObjectList<Playable>::const_iterator node = Playable::objectList().begin();
     103  for (ObjectList<Playable>::const_iterator node = Playable::objectList().begin();
    104104       node != Playable::objectList().end();
    105105       ++node)

  • branches/new_class_id/src/world_entities/player.h

    r9705 r9715  
    2323class Player : public EventListener
    2424{
    25   NewObjectListDeclaration(Player);
     25  ObjectListDeclaration(Player);
    2626
    2727  public:

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

    r9709 r9715  
    2525
    2626#include "class_id.h"
    27 NewObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
     27ObjectListDefinitionID(LaserPowerUp, CL_LASER_POWER_UP);
    2828CREATE_FACTORY(LaserPowerUp);
    2929

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

    r9709 r9715  
    1313
    1414class LaserPowerUp : public PowerUp {
    15   NewObjectListDeclaration(LaserPowerUp);
     15  ObjectListDeclaration(LaserPowerUp);
    1616
    1717 public:

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

    r9709 r9715  
    2828
    2929#include "class_id.h"
    30 NewObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
     30ObjectListDefinitionID(ParamPowerUp, CL_PARAM_POWER_UP);
    3131CREATE_FACTORY(ParamPowerUp);
    3232

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

    r9705 r9715  
    2020
    2121class ParamPowerUp : public PowerUp {
    22   NewObjectListDeclaration(ParamPowerUp);
     22  ObjectListDeclaration(ParamPowerUp);
    2323
    2424public:

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

    r9705 r9715  
    2525
    2626
    27 NewObjectListDefinition(PowerUp);
     27ObjectListDefinition(PowerUp);
    2828
    2929PowerUp::PowerUp(float r, float g, float b)

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

    r9705 r9715  
    2121
    2222class PowerUp : public WorldEntity {
    23   NewObjectListDeclaration(PowerUp);
     23  ObjectListDeclaration(PowerUp);
    2424
    2525public:

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

    r9709 r9715  
    2525
    2626#include "class_id.h"
    27 NewObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
     27ObjectListDefinitionID(TurretPowerUp, CL_TURRET_POWER_UP);
    2828CREATE_FACTORY(TurretPowerUp);
    2929

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

    r9709 r9715  
    1313
    1414class TurretPowerUp : public PowerUp {
    15   NewObjectListDeclaration(TurretPowerUp);
     15  ObjectListDeclaration(TurretPowerUp);
    1616
    1717 public:

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

    r9709 r9715  
    2828
    2929#include "class_id.h"
    30 NewObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
     30ObjectListDefinitionID(WeaponPowerUp, CL_WEAPON_POWER_UP);
    3131CREATE_FACTORY(WeaponPowerUp);
    3232

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

    r9705 r9715  
    1414
    1515class WeaponPowerUp : public PowerUp {
    16 NewObjectListDeclaration(WeaponPowerUp);
     16ObjectListDeclaration(WeaponPowerUp);
    1717public:
    1818  WeaponPowerUp(const TiXmlElement* root = NULL);

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

    r9709 r9715  
    2626
    2727#include "class_id.h"
    28 NewObjectListDefinitionID(Bomb, CL_BOMB);
     28ObjectListDefinitionID(Bomb, CL_BOMB);
    2929CREATE_FAST_FACTORY_STATIC(Bomb);
    3030

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

    r9709 r9715  
    1717class Bomb : public Projectile
    1818{
    19   NewObjectListDeclaration(Bomb);
     19  ObjectListDeclaration(Bomb);
    2020 public:
    2121  Bomb(const TiXmlElement* root = NULL);

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

    r9709 r9715  
    2727
    2828#include "class_id.h"
    29 NewObjectListDefinitionID(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
     29ObjectListDefinitionID(BoomerangProjectile, CL_BOOMERANG_PROJECTILE);
    3030CREATE_FAST_FACTORY_STATIC(BoomerangProjectile);
    3131

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

    r9709 r9715  
    1717class BoomerangProjectile : public Projectile
    1818{
    19   NewObjectListDeclaration(BoomerangProjectile);
     19  ObjectListDeclaration(BoomerangProjectile);
    2020  public:
    2121    BoomerangProjectile ();

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

    r9709 r9715  
    2626
    2727#include "class_id.h"
    28 NewObjectListDefinitionID(GuidedMissile, CL_GUIDED_MISSILE);
     28ObjectListDefinitionID(GuidedMissile, CL_GUIDED_MISSILE);
    2929CREATE_FAST_FACTORY_STATIC(GuidedMissile);
    3030

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

    r9709 r9715  
    1616class GuidedMissile : public Projectile
    1717{
    18   NewObjectListDeclaration(GuidedMissile);
     18  ObjectListDeclaration(GuidedMissile);
    1919  public:
    2020    GuidedMissile ();

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

    r9709 r9715  
    2626
    2727#include "class_id.h"
    28 NewObjectListDefinitionID(Hyperblast, CL_HYPERBLAST);
     28ObjectListDefinitionID(Hyperblast, CL_HYPERBLAST);
    2929CREATE_FAST_FACTORY_STATIC(Hyperblast);
    3030

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

    r9709 r9715  
    1717class Hyperblast : public Projectile
    1818{
    19   NewObjectListDeclaration(Hyperblast);
     19  ObjectListDeclaration(Hyperblast);
    2020  public:
    2121    Hyperblast ();

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

    r9709 r9715  
    2929
    3030#include "class_id.h"
    31 NewObjectListDefinition(Laser);
     31ObjectListDefinition(Laser);
    3232CREATE_FAST_FACTORY_STATIC(Laser);
    3333

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

    r9709 r9715  
    1717class Laser : public Projectile
    1818{
    19   NewObjectListDeclaration(Laser);
     19  ObjectListDeclaration(Laser);
    2020  public:
    2121    Laser ();

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

    r9705 r9715  
    2626#include "debug.h"
    2727
    28 NewObjectListDefinition(Projectile);
     28ObjectListDefinition(Projectile);
    2929
    3030/**

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

    r9709 r9715  
    1818class Projectile : public WorldEntity
    1919{
    20   NewObjectListDeclaration(Projectile);
     20  ObjectListDeclaration(Projectile);
    2121  public:
    2222    Projectile ();

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

    r9709 r9715  
    2929
    3030#include "class_id.h"
    31 NewObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
     31ObjectListDefinitionID(RailProjectile, CL_RAIL_PROJECTILE);
    3232CREATE_FAST_FACTORY_STATIC(RailProjectile);
    3333

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

    r9709 r9715  
    1717class RailProjectile : public Projectile
    1818{
    19   NewObjectListDeclaration(RailProjectile);
     19  ObjectListDeclaration(RailProjectile);
    2020  public:
    2121    RailProjectile ();

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

    r9709 r9715  
    2626
    2727#include "class_id.h"
    28 NewObjectListDefinitionID(Rocket, CL_ROCKET);
     28ObjectListDefinitionID(Rocket, CL_ROCKET);
    2929CREATE_FAST_FACTORY_STATIC(Rocket);
    3030

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

    r9709 r9715  
    1515class Rocket : public Projectile
    1616{
    17   NewObjectListDeclaration(Rocket);
     17  ObjectListDeclaration(Rocket);
    1818
    1919public:

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

    r9709 r9715  
    2525
    2626#include "class_id.h"
    27 NewObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
     27ObjectListDefinitionID(TestBullet, CL_TEST_BULLET);
    2828CREATE_FAST_FACTORY_STATIC(TestBullet);
    2929

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

    r9709 r9715  
    1717class TestBullet : public Projectile
    1818{
    19   NewObjectListDeclaration(TestBullet);
     19  ObjectListDeclaration(TestBullet);
    2020
    2121  public:

  • branches/new_class_id/src/world_entities/recorder.cc

    r9709 r9715  
    2323
    2424#include "class_id.h"
    25 NewObjectListDefinitionID(Recorder, CL_RECORDER);
     25ObjectListDefinitionID(Recorder, CL_RECORDER);
    2626CREATE_FACTORY(Recorder);
    2727

  • branches/new_class_id/src/world_entities/recorder.h

    r9709 r9715  
    2020class Recorder : public WorldEntity
    2121{
    22   NewObjectListDeclaration(Recorder);
     22  ObjectListDeclaration(Recorder);
    2323  public:
    2424    Recorder (const TiXmlElement* root = NULL);

  • branches/new_class_id/src/world_entities/satellite.cc

    r9709 r9715  
    2525
    2626
    27 NewObjectListDefinition(Satellite);
     27ObjectListDefinition(Satellite);
    2828
    2929/**

  • branches/new_class_id/src/world_entities/satellite.h

    r9709 r9715  
    1919class Satellite : public WorldEntity
    2020{
    21   NewObjectListDeclaration(Satellite);
     21  ObjectListDeclaration(Satellite);
    2222
    2323 public:

  • branches/new_class_id/src/world_entities/script_trigger.cc

    r9709 r9715  
    2020#include "state.h"
    2121
    22 NewObjectListDefinition(ScriptTrigger);
     22ObjectListDefinition(ScriptTrigger);
    2323
    2424CREATE_SCRIPTABLE_CLASS(ScriptTrigger, ScriptTrigger::classID(),

  • branches/new_class_id/src/world_entities/script_trigger.h

    r9709 r9715  
    1818class ScriptTrigger : public WorldEntity
    1919{
    20   NewObjectListDeclaration(ScriptTrigger);
     20  ObjectListDeclaration(ScriptTrigger);
    2121  public:
    2222    ScriptTrigger(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/world_entities/skybox.cc

    r9709 r9715  
    3232
    3333#include "class_id.h"
    34 NewObjectListDefinitionID(SkyBox, CL_SKYBOX);
     34ObjectListDefinitionID(SkyBox, CL_SKYBOX);
    3535CREATE_FACTORY(SkyBox);
    3636

  • branches/new_class_id/src/world_entities/skybox.h

    r9709 r9715  
    2727class SkyBox : public WorldEntity
    2828{
    29   NewObjectListDeclaration(SkyBox);
     29  ObjectListDeclaration(SkyBox);
    3030public:
    3131  SkyBox(const std::string& fileName = "");

  • branches/new_class_id/src/world_entities/skydome.cc

    r9709 r9715  
    3030
    3131
    32 NewObjectListDefinition(Skydome);
     32ObjectListDefinition(Skydome);
    3333
    3434/**

  • branches/new_class_id/src/world_entities/skydome.h

    r9709 r9715  
    2121class Skydome : public WorldEntity
    2222{
    23   NewObjectListDeclaration(Skydome);
     23  ObjectListDeclaration(Skydome);
    2424public:
    2525  Skydome();

  • branches/new_class_id/src/world_entities/skysphere.cc

    r9709 r9715  
    3232
    3333
    34 NewObjectListDefinition(Skysphere);
     34ObjectListDefinition(Skysphere);
    3535
    3636/**

  • branches/new_class_id/src/world_entities/skysphere.h

    r9709 r9715  
    2424class Skysphere : public WorldEntity
    2525{
    26   NewObjectListDeclaration(Skysphere);
     26  ObjectListDeclaration(Skysphere);
    2727
    2828 public:

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

    r9709 r9715  
    2525
    2626#include "class_id.h"
    27 NewObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
     27ObjectListDefinitionID(CollisionProbe, CL_COLLISION_PROBE);
    2828
    2929CREATE_FACTORY(CollisionProbe);

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

    r9709 r9715  
    1313class CollisionProbe : public Playable
    1414{
    15   NewObjectListDeclaration(CollisionProbe);
     15  ObjectListDeclaration(CollisionProbe);
    1616
    1717  public:

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

    r9709 r9715  
    3535
    3636#include "class_id.h"
    37 NewObjectListDefinitionID(Cruizer, CL_CRUIZER);
     37ObjectListDefinitionID(Cruizer, CL_CRUIZER);
    3838CREATE_FACTORY(Cruizer);
    3939

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

    r9709 r9715  
    1616class Cruizer : public Playable
    1717{
    18   NewObjectListDeclaration(Cruizer);
     18  ObjectListDeclaration(Cruizer);
    1919  public:
    2020    Cruizer(const std::string& fileName);

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

    r9709 r9715  
    3535
    3636#include "class_id.h"
    37 NewObjectListDefinitionID(Helicopter, CL_HELICOPTER);
     37ObjectListDefinitionID(Helicopter, CL_HELICOPTER);
    3838CREATE_FACTORY(Helicopter);
    3939#include "script_class.h"

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

    r9709 r9715  
    1717class Helicopter : public Playable
    1818{
    19   NewObjectListDeclaration(Helicopter);
     19  ObjectListDeclaration(Helicopter);
    2020
    2121  public:

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

    r9709 r9715  
    3535
    3636#include "class_id.h"
    37 NewObjectListDefinitionID(Hover, CL_HOVER);
     37ObjectListDefinitionID(Hover, CL_HOVER);
    3838CREATE_FACTORY(Hover);
    3939

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

    r9709 r9715  
    1515class Hover : public Playable
    1616{
    17   NewObjectListDeclaration(Hover);
     17  ObjectListDeclaration(Hover);
    1818  public:
    1919

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

    r9709 r9715  
    5454
    5555#include "class_id.h"
    56 NewObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
     56ObjectListDefinitionID(SpaceShip, CL_SPACE_SHIP);
    5757CREATE_FACTORY(SpaceShip);
    5858

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

    r9709 r9715  
    1919class SpaceShip : public Playable
    2020{
    21   NewObjectListDeclaration(SpaceShip);
     21  ObjectListDeclaration(SpaceShip);
    2222
    2323  public:

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

    r9709 r9715  
    3939
    4040#include "class_id.h"
    41 NewObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
     41ObjectListDefinitionID(Spacecraft2D, CL_SPACECRAFT_2D);
    4242CREATE_FACTORY(Spacecraft2D);
    4343

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

    r9709 r9715  
    1616class Spacecraft2D : public Playable
    1717{
    18   NewObjectListDeclaration(Spacecraft2D);
     18  ObjectListDeclaration(Spacecraft2D);
    1919  public:
    2020    Spacecraft2D(const std::string& fileName);

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

    r9709 r9715  
    3535
    3636#include "class_id.h"
    37 NewObjectListDefinitionID(TurbineHover, CL_TURBINE_HOVER);
     37ObjectListDefinitionID(TurbineHover, CL_TURBINE_HOVER);
    3838CREATE_FACTORY(TurbineHover);
    3939

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

    r9709 r9715  
    1818class TurbineHover : public Playable
    1919{
    20   NewObjectListDeclaration(TurbineHover);
     20  ObjectListDeclaration(TurbineHover);
    2121public:
    2222  TurbineHover(const std::string& fileName);

  • branches/new_class_id/src/world_entities/spawning_point.cc

    r9709 r9715  
    3434
    3535#include "class_id.h"
    36 NewObjectListDefinitionID(SpawningPoint, CL_SPAWNING_POINT);
     36ObjectListDefinitionID(SpawningPoint, CL_SPAWNING_POINT);
    3737CREATE_FACTORY( SpawningPoint);
    3838/**
    … …  
    109109  bool found = false;
    110110
    111   for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
     111  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
    112112       it != Playable::objectList().end();
    113113       ++it)
    … …  
    160160      bool found = false;
    161161
    162       for (NewObjectList<Playable>::const_iterator it2 = Playable::objectList().begin();
     162      for (ObjectList<Playable>::const_iterator it2 = Playable::objectList().begin();
    163163           it2 != Playable::objectList().end();
    164164           ++it2)
    … …  
    235235  Playable      * playable = NULL;
    236236
    237   for (NewObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
     237  for (ObjectList<SpawningPoint>::const_iterator it = SpawningPoint::objectList().begin();
    238238       it != SpawningPoint::objectList().end();
    239239       ++it)
    … …  
    253253  }
    254254
    255   for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
     255  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
    256256       it != Playable::objectList().end();
    257257       ++it)

  • branches/new_class_id/src/world_entities/spawning_point.h

    r9705 r9715  
    4242 */
    4343class SpawningPoint : public WorldEntity {
    44   NewObjectListDeclaration(SpawningPoint);
     44  ObjectListDeclaration(SpawningPoint);
    4545  public:
    4646    SpawningPoint(const TiXmlElement* root = NULL);

  • branches/new_class_id/src/world_entities/spectator.cc

    r9709 r9715  
    2323
    2424#include "class_id.h"
    25 NewObjectListDefinitionID(Spectator, CL_SPECTATOR);
     25ObjectListDefinitionID(Spectator, CL_SPECTATOR);
    2626CREATE_FACTORY(Spectator);
    2727

  • branches/new_class_id/src/world_entities/spectator.h

    r9709 r9715  
    1111class Spectator : public Playable
    1212{
    13   NewObjectListDeclaration(Spectator);
     13  ObjectListDeclaration(Spectator);
    1414
    1515  public:

  • branches/new_class_id/src/world_entities/terrain.cc

    r9713 r9715  
    3535
    3636#include "class_id.h"
    37 NewObjectListDefinitionID(Terrain, CL_TERRAIN);
     37ObjectListDefinitionID(Terrain, CL_TERRAIN);
    3838CREATE_FACTORY(Terrain);
    3939

  • branches/new_class_id/src/world_entities/terrain.h

    r9709 r9715  
    2525class Terrain : public WorldEntity
    2626{
    27   NewObjectListDeclaration(Terrain);
     27  ObjectListDeclaration(Terrain);
    2828
    2929 public:

  • branches/new_class_id/src/world_entities/test_entity.cc

    r9709 r9715  
    3636
    3737#include "class_id.h"
    38 NewObjectListDefinition(TestEntity);
     38ObjectListDefinition(TestEntity);
    3939CREATE_FACTORY(TestEntity);
    4040

  • branches/new_class_id/src/world_entities/test_entity.h

    r9709 r9715  
    1515class TestEntity : public WorldEntity, public PhysicsInterface
    1616{
    17   NewObjectListDeclaration(TestEntity);
     17  ObjectListDeclaration(TestEntity);
    1818 public:
    1919  TestEntity ();

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

    r9709 r9715  
    2929
    3030
    31 NewObjectListDefinition(Aim);
     31ObjectListDefinition(Aim);
    3232
    3333/**

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

    r9709 r9715  
    2929class Aim : public PNode, public Element2D
    3030{
    31   NewObjectListDeclaration(Aim);
     31  ObjectListDeclaration(Aim);
    3232
    3333public:

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

    r9709 r9715  
    3030
    3131
    32 NewObjectListDefinition(AimingSystem);
     32ObjectListDefinition(AimingSystem);
    3333
    3434/**

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

    r9709 r9715  
    2121class AimingSystem : public WorldEntity
    2222{
    23   NewObjectListDeclaration(AimingSystem);
     23  ObjectListDeclaration(AimingSystem);
    2424
    2525 public:

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

    r9709 r9715  
    2828
    2929#include "class_id.h"
    30 NewObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
     30ObjectListDefinitionID(AimingTurret, CL_AIMING_TURRET);
    3131CREATE_FACTORY(AimingTurret);
    3232

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

    r9709 r9715  
    1313class AimingTurret : public Weapon
    1414{
    15   NewObjectListDeclaration(AimingTurret);
     15  ObjectListDeclaration(AimingTurret);
    1616
    1717public:

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

    r9705 r9715  
    2323
    2424
    25 NewObjectListDefinition(AmmoContainer);
     25ObjectListDefinition(AmmoContainer);
    2626/**
    2727 * standard constructor
    2828 * @todo this constructor is not jet implemented - do it
    2929*/
    30 AmmoContainer::AmmoContainer (const NewClassID& projectileType, float maxEnergy)
     30AmmoContainer::AmmoContainer (const ClassID& projectileType, float maxEnergy)
    3131{
    3232  this->registerObject(this, AmmoContainer::_objectList);

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

    r9705 r9715  
    1717//! A class for Storing energy of Projectiles.
    1818class AmmoContainer : public BaseObject {
    19   NewObjectListDeclaration(AmmoContainer);
     19  ObjectListDeclaration(AmmoContainer);
    2020
    2121 public:
    22   AmmoContainer(const NewClassID& id, float maxEnergy = DEFAULT_MAX_ENERGY);
     22  AmmoContainer(const ClassID& id, float maxEnergy = DEFAULT_MAX_ENERGY);
    2323  virtual ~AmmoContainer();
    2424
    2525  bool operator=(int projectileType) const { return (this->projectileType == projectileType); };
    26   NewClassID getProjectileType() const { return this->projectileType; };
     26  ClassID getProjectileType() const { return this->projectileType; };
    2727
    2828  float increaseEnergy(float energy);
    … …  
    4242   float  maxEnergy;
    4343
    44    NewClassID projectileType;
     44   ClassID projectileType;
    4545};
    4646

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

    r9709 r9715  
    2828
    2929#include "class_id.h"
    30 NewObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
     30ObjectListDefinitionID(BoomerangGun, CL_BOOMERANG_GUN);
    3131CREATE_FACTORY(BoomerangGun);
    3232

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

    r9709 r9715  
    1111class BoomerangGun : public Weapon
    1212  {
    13     NewObjectListDeclaration(BoomerangGun);
     13    ObjectListDeclaration(BoomerangGun);
    1414  public:
    1515    BoomerangGun ();

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

    r9709 r9715  
    3737
    3838#include "class_id.h"
    39 NewObjectListDefinitionID(Cannon, CL_CANNON);
     39ObjectListDefinitionID(Cannon, CL_CANNON);
    4040CREATE_FACTORY(Cannon);
    4141

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

    r9709 r9715  
    1212class Cannon : public Weapon
    1313  {
    14     NewObjectListDeclaration(Cannon);
     14    ObjectListDeclaration(Cannon);
    1515  public:
    1616    Cannon ();

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

    r9705 r9715  
    2626
    2727
    28 NewObjectListDefinition(Crosshair);
     28ObjectListDefinition(Crosshair);
    2929/**
    3030 * standart constructor

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

    r9705 r9715  
    2222//! A class that enables the
    2323class Crosshair : public PNode, public Element2D, public EventListener {
    24   NewObjectListDeclaration(Crosshair);
     24  ObjectListDeclaration(Crosshair);
    2525 public:
    2626  Crosshair(const TiXmlElement* root = NULL);

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

    r9709 r9715  
    4040
    4141#include "class_id.h"
    42 NewObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
     42ObjectListDefinitionID(FPSSniperRifle, CL_FPS_SNIPER_RIFLE);
    4343CREATE_FACTORY(FPSSniperRifle);
    4444

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

    r9709 r9715  
    3939class FPSSniperRifle : public Weapon
    4040  {
    41     NewObjectListDeclaration(FPSSniperRifle);
     41    ObjectListDeclaration(FPSSniperRifle);
    4242
    4343  public:

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

    r9709 r9715  
    3636
    3737#include "class_id.h"
    38 NewObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
     38ObjectListDefinitionID(Hyperblaster, CL_HYPERBLASTER);
    3939CREATE_FACTORY(Hyperblaster);
    4040

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

    r9709 r9715  
    1212class Hyperblaster : public Weapon
    1313  {
    14     NewObjectListDeclaration(Hyperblaster);
     14    ObjectListDeclaration(Hyperblaster);
    1515    public:
    1616    Hyperblaster (const TiXmlElement* root = NULL);

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

    r9709 r9715  
    3232
    3333#include "class_id.h"
    34 NewObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
     34ObjectListDefinitionID(LaserCannon, CL_LASER_CANNON);
    3535CREATE_FACTORY(LaserCannon);
    3636

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

    r9709 r9715  
    2929class LaserCannon : public Weapon
    3030  {
    31     NewObjectListDeclaration(LaserCannon);
     31    ObjectListDeclaration(LaserCannon);
    3232    public:
    3333    LaserCannon (const TiXmlElement* root = NULL);

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

    r9709 r9715  
    2727
    2828#include "class_id.h"
    29 NewObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
     29ObjectListDefinitionID(TargetingTurret, CL_TARGETING_TURRET);
    3030CREATE_FACTORY(TargetingTurret);
    3131

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

    r9709 r9715  
    1212class TargetingTurret : public Weapon
    1313{
    14   NewObjectListDeclaration(TargetingTurret);
     14  ObjectListDeclaration(TargetingTurret);
    1515public:
    1616  TargetingTurret(const TiXmlElement* root = NULL);

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

    r9709 r9715  
    3434
    3535#include "class_id.h"
    36 NewObjectListDefinitionID(TestGun, CL_TEST_GUN);
     36ObjectListDefinitionID(TestGun, CL_TEST_GUN);
    3737CREATE_FACTORY(TestGun);
    3838/**

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

    r9709 r9715  
    3737class TestGun : public Weapon
    3838  {
    39     NewObjectListDeclaration(TestGun);
     39    ObjectListDeclaration(TestGun);
    4040  public:
    4141    TestGun (int leftRight);

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

    r9709 r9715  
    2828
    2929#include "class_id.h"
    30 NewObjectListDefinitionID(Turret, CL_TURRET);
     30ObjectListDefinitionID(Turret, CL_TURRET);
    3131CREATE_FACTORY(Turret);
    3232

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

    r9709 r9715  
    1111class Turret : public Weapon
    1212  {
    13     NewObjectListDeclaration(Turret);
     13    ObjectListDeclaration(Turret);
    1414  public:
    1515    Turret ();

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

    r9709 r9715  
    3535#include "elements/glgui_energywidget.h"
    3636
    37 NewObjectListDefinition(Weapon);
     37ObjectListDefinition(Weapon);
    3838
    3939////////////////////
    … …  
    7272 * @returns the newly created Weapon.
    7373 */
    74 Weapon* Weapon::createWeapon(const NewClassID& weaponID)
     74Weapon* Weapon::createWeapon(const ClassID& weaponID)
    7575{
    7676  BaseObject* createdObject = Factory::fabricate(weaponID);
    … …  
    179179 * What it does, is telling the Weapon what Projectiles it can Emit.
    180180 */
    181 void Weapon::setProjectileType(const NewClassID& projectile)
     181void Weapon::setProjectileType(const ClassID& projectile)
    182182{
    183183  this->projectile = projectile;

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

    r9705 r9715  
    8383class Weapon : public WorldEntity
    8484{
    85   NewObjectListDeclaration(Weapon);
     85  ObjectListDeclaration(Weapon);
    8686
    8787  public:
    … …  
    8989    Weapon ();
    9090    virtual ~Weapon ();
    91     static Weapon* createWeapon(const NewClassID& weaponID);
     91    static Weapon* createWeapon(const ClassID& weaponID);
    9292    static Weapon* createWeapon(const std::string& weaponName);
    9393
    … …  
    113113    /** @returns the Capabilities of this Weapon */
    114114    inline long getCapability() const { return this->capability; };
    115     void setProjectileType(const NewClassID& projectile);
     115    void setProjectileType(const ClassID& projectile);
    116116    void setProjectileTypeC(const std::string& projectile);
    117117    /** @returns The projectile's classID */
    118     inline NewClassID getProjectileType() { return this->projectile; };
     118    inline ClassID getProjectileType() { return this->projectile; };
    119119    /** @returns the FastFactory, that creates Projectiles of type getProjectile */
    120120    inline FastFactory* getProjectileFactory() { return this->projectileFactory; };
    … …  
    233233    bool                   chargeable;                      //!< if the Weapon is charcheable (if true, the weapon will charge before it fires.)
    234234
    235     NewClassID                projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
     235    ClassID                projectile;                      //!< the projectile used for this weapon (since they should be generated via macro and the FastFactory, only the ClassID must be known.)
    236236    FastFactory*           projectileFactory;               //!< A factory, that produces and handles the projectiles.
    237237  };

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

    r9705 r9715  
    3131
    3232
    33 NewObjectListDefinition(WeaponManager);
     33ObjectListDefinition(WeaponManager);
    3434/**
    3535 * @brief this initializes the weaponManager for a given nnumber of weapon slots
    … …  
    311311 * @param ammo the ammo to increase
    312312 */
    313 float WeaponManager::increaseAmmunition(const NewClassID& projectileType, float ammo)
     313float WeaponManager::increaseAmmunition(const ClassID& projectileType, float ammo)
    314314{
    315315  return this->getAmmoContainer(projectileType)->increaseEnergy(ammo);
    … …  
    523523}
    524524
    525 CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(const NewClassID& projectileType)
     525CountPointer<AmmoContainer>& WeaponManager::getAmmoContainer(const ClassID& projectileType)
    526526{
    527527  for (unsigned int i = 0; i < this->ammo.size(); i++)

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

    r9705 r9715  
    3939 */
    4040class WeaponManager : public BaseObject {
    41   NewObjectListDeclaration(WeaponManager);
     41  ObjectListDeclaration(WeaponManager);
    4242
    4343  //! an enumerator defining a Slot, where a Weapon can be stored inside.
    … …  
    9090    void changeWeaponConfig(int weaponConfig);
    9191
    92     float increaseAmmunition(const NewClassID& projectileType, float ammo);
     92    float increaseAmmunition(const ClassID& projectileType, float ammo);
    9393    float inclreaseAmmunition(const Weapon* weapon, float ammo);
    9494
    … …  
    107107 // private:
    108108    int getNextFreeSlot(int configID, long capability = WTYPE_ALL);
    109     CountPointer<AmmoContainer>& getAmmoContainer(const NewClassID& projectileType);
     109    CountPointer<AmmoContainer>& getAmmoContainer(const ClassID& projectileType);
    110110    CountPointer<AmmoContainer>& getAmmoContainer(const Weapon* weapon);
    111111

  • branches/new_class_id/src/world_entities/world_entity.cc

    r9705 r9715  
    4848
    4949
    50 NewObjectListDefinition(WorldEntity);
     50ObjectListDefinition(WorldEntity);
    5151/**
    5252 *  Loads the WordEntity-specific Part of any derived Class
    … …  
    302302 *  @param target1 a filter target (classID)
    303303 */
    304 void WorldEntity::subscribeReaction(CREngine::CRType type, const NewClassID& target1)
     304void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1)
    305305{
    306306  this->subscribeReaction(type);
    … …  
    316316 *  @param target1 a filter target (classID)
    317317 */
    318 void WorldEntity::subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2)
     318void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2)
    319319{
    320320  this->subscribeReaction(type);
    … …  
    331331 *  @param target1 a filter target (classID)
    332332 */
    333 void WorldEntity::subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2, const NewClassID& target3)
     333void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3)
    334334{
    335335  this->subscribeReaction(type);
    … …  
    347347 *  @param target1 a filter target (classID)
    348348 */
    349 void WorldEntity::subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2, const NewClassID& target3, const NewClassID& target4)
     349void WorldEntity::subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3, const ClassID& target4)
    350350{
    351351  this->subscribeReaction(type);

  • branches/new_class_id/src/world_entities/world_entity.h

    r9705 r9715  
    4141class WorldEntity : public PNode
    4242{
    43   NewObjectListDeclaration(WorldEntity);
     43  ObjectListDeclaration(WorldEntity);
    4444public:
    4545  WorldEntity();
    … …  
    8383  /* --- Collision Reaction Block --- */
    8484  void subscribeReaction(CREngine::CRType type);
    85   void subscribeReaction(CREngine::CRType type, const NewClassID& target1);
    86   void subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2);
    87   void subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2, const NewClassID& target3);
    88   void subscribeReaction(CREngine::CRType type, const NewClassID& target1, const NewClassID& target2, const NewClassID& target3, const NewClassID& target4);
     85  void subscribeReaction(CREngine::CRType type, const ClassID& target1);
     86  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2);
     87  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3);
     88  void subscribeReaction(CREngine::CRType type, const ClassID& target1, const ClassID& target2, const ClassID& target3, const ClassID& target4);
    8989
    9090  void unsubscribeReaction(CREngine::CRType type);
Note: See TracChangeset for help on using the changeset viewer.