Changeset 9691 in orxonox.OLD

Timestamp:

Aug 22, 2006, 11:45:21 PM (18 years ago)

Author:

bensch

Message:

new_class_id: adapted Network

Location:

branches/new_class_id/src

Files:

• lib/coord/p_node.cc (modified) (2 diffs)
• lib/coord/p_node.h (modified) (9 diffs)
• lib/lang/base_object.cc (modified) (2 diffs)
• lib/lang/base_object.h (modified) (4 diffs)
• lib/lang/new_class_id.h (modified) (2 diffs)
• lib/lang/new_object_list.h (modified) (1 diff)
• lib/network/data_stream.cc (modified) (2 diffs)
• lib/network/handshake.cc (modified) (1 diff)
• lib/network/message_manager.cc (modified) (1 diff)
• lib/network/monitor/connection_monitor.cc (modified) (1 diff)
• lib/network/monitor/network_monitor.cc (modified) (1 diff)
• lib/network/monitor/network_stats_widget.cc (modified) (1 diff)
• lib/network/monitor/network_stats_widget.h (modified) (2 diffs)
• lib/network/network_game_manager.cc (modified) (9 diffs)
• lib/network/network_manager.cc (modified) (2 diffs)
• lib/network/network_protocol.cc (modified) (2 diffs)
• lib/network/network_stream.cc (modified) (7 diffs)
• lib/network/player_stats.cc (modified) (7 diffs)
• lib/network/player_stats.h (modified) (1 diff)
• lib/network/proxy/network_settings.cc (modified) (1 diff)
• lib/network/proxy/proxy_control.cc (modified) (2 diffs)
• lib/network/shared_network_data.cc (modified) (1 diff)
• lib/network/synchronizeable.cc (modified) (1 diff)
• lib/network/tcp_server_socket.cc (modified) (1 diff)
• lib/network/tcp_socket.cc (modified) (1 diff)
• lib/network/udp_broadcast.cc (modified) (1 diff)
• lib/network/udp_broadcast.h (modified) (1 diff)
• lib/util/loading/factory.cc (modified) (1 diff)
• lib/util/loading/factory.h (modified) (1 diff)
• util/multiplayer_team_deathmatch.h (modified) (5 diffs)
• util/network_game_rules.h (modified) (1 diff)
• world_entities/playable.cc (modified) (2 diffs)
• world_entities/playable.h (modified) (1 diff)

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

@@ -729 +729 @@
   if (likely(PNode::nullParent == NULL))
   {
-    PNode::nullParent = new PNode(NULL, PNODE_PARENT_MODE_DEFAULT | PNODE_REPARENT_TO_NULL);
+    PNode::nullParent = new NullParent();
     //PNode::nullParent->registerObject(, CL_NULL_PARENT);
     PNode::nullParent->setName("NullParent");
@@ -1105 +1105 @@
 }
 
-
+NewObjectListDefinition(NullParent);
+
+NullParent::NullParent()
+  : PNode(NULL, PNODE_PARENT_MODE_DEFAULT | PNODE_REPARENT_TO_NULL)
+{
+  this->registerObject(this, NullParent::_objectList);
+}

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

@@ -50 +50 @@
   PNODE_REPARENT_DELETE_CHILDREN       = 0x0040,    //!< Deletes the Children of the node when This Node is Removed. (Use with care).
   /// FIXME
-   PNODE_REPARENT_KEEP_POSITION         = 0x0080,    //!< Tries to keep the Position if the Node is reparented.
+  PNODE_REPARENT_KEEP_POSITION         = 0x0080,    //!< Tries to keep the Position if the Node is reparented.
 
 
@@ -73 +73 @@
 
 //! Patent Node is a Engine to calculate the position of an Object in respect to the position of its parent.
-class PNode : virtual public BaseObject, virtual public Synchronizeable {
+class PNode : virtual public BaseObject, virtual public Synchronizeable
+{
   NewObjectListDeclaration(PNode);
 
-  public:
+public:
   PNode (PNode* parent = PNode::getNullParent(), long nodeFlags = PNODE_PARENT_MODE_DEFAULT);
   virtual ~PNode ();
@@ -97 +98 @@
   inline const Vector& getRelCoor () const { return this->prevRelCoordinate; };
   /** @returns the Relative Coordinate Destination */
-  inline const Vector& getRelCoorSoft2D() const { return (this->toCoordinate)? *this->toCoordinate : this->relCoordinate; };
+inline const Vector& getRelCoorSoft2D() const { return (this->toCoordinate)? *this->toCoordinate : this->relCoordinate; };
   void setAbsCoor (const Vector& absCoord);
   void setAbsCoor (float x, float y, float z);
@@ -132 +133 @@
   inline const Quaternion& getRelDir () const { return this->prevRelDirection; };
   /** @returns the Relative Directional Destination */
-  inline const Quaternion& getRelDirSoft2D() const { return (this->toDirection)? *this->toDirection : this->relDirection; };
+inline const Quaternion& getRelDirSoft2D() const { return (this->toDirection)? *this->toDirection : this->relDirection; };
   /** @returns a Vector pointing into the relative Direction */
   inline Vector getRelDirV() const { return this->prevRelDirection.apply(Vector(0,1,0)); };
@@ -180 +181 @@
   void removeNodeFlags(unsigned short nodeFlags);
 
-  // NULL_PARENT //
   /** @returns the NullParent, the (main) ROOT of the PNode Tree. If it does not yet exist, it will be created. */
-  static PNode* getNullParent()  { return (PNode::nullParent != NULL)? PNode::nullParent : PNode::createNullParent(); };
+static PNode* getNullParent()  { return (PNode::nullParent != NULL) ? PNode::nullParent : PNode::createNullParent(); };
 
   // UPDATING //
@@ -197 +197 @@
   float distance(const PNode* node) const { return (this->getAbsCoor() - node->getAbsCoor()).len(); };
 
- private:
+private:
   /** tells the child that the parent's Coordinate has changed */
   inline void parentCoorChanged () { this->bRelCoorChanged = true; }
   /** tells the child that the parent's Direction has changed */
   inline void parentDirChanged () { this->bRelDirChanged = true; }
- public:
+public:
   /** @returns the last calculated coordinate */
   inline Vector getLastAbsCoor() { return this->lastAbsCoordinate; }
- private:
+private:
   static PNode* createNullParent();
   void reparent();
@@ -211 +211 @@
   void eraseChild(PNode* child);
 
- private:
+private:
   bool               bRelCoorChanged;    //!< If Relative Coordinate has changed since last time we checked
   bool               bRelDirChanged;     //!< If Relative Direction has changed since last time we checked
@@ -223 +223 @@
   Vector             lastAbsCoordinate;  //!< this is used for speedcalculation, it stores the last coordinate
   Quaternion         prevRelDirection;   //!< The last Relative Direciton from the last update-Cycle.
-//  Quaternion         lastAbsDirection;
+  //  Quaternion         lastAbsDirection;
 
   Vector             velocity;           //!< Saves the velocity.
@@ -240 +240 @@
   static PNode*      nullParent;         //!< The ROOT of the main PNode Tree.
 
-  private:
-    float coorx;
-    float coory;
-    float coorz;
-
-    float rotw;
-    float rotx;
-    float roty;
-    float rotz;
-
-  private:
-    int relCoordinate_handle;
-    int relDirection_handle;
-    Vector relCoordinate_write;
-    Quaternion relDirection_write;
-
-  public:
-    virtual void varChangeHandler( std::list<int> & id );
+private:
+  float coorx;
+  float coory;
+  float coorz;
+
+  float rotw;
+  float rotx;
+  float roty;
+  float rotz;
+
+private:
+  int relCoordinate_handle;
+  int relDirection_handle;
+  Vector relCoordinate_write;
+  Quaternion relDirection_write;
+
+public:
+  virtual void varChangeHandler( std::list<int> & id );
 };
 
+// NULL_PARENT //
+class NullParent : public PNode
+{
+  NewObjectListDeclaration(NullParent);
+  friend class PNode;
+  NullParent();
+};
+
+
 #endif /* _P_NODE_H */

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

@@ -21 +21 @@
 #include "util/loading/load_param.h"
 
+NewObjectListDefinition(BaseObject);
+
 /**
  * @brief sets the name from a LoadXML-Element
@@ -26 +28 @@
  */
 BaseObject::BaseObject(const std::string& objectName)
+  : _leafClassID(&BaseObject::classID())
 {
   this->className = "BaseObject";

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

@@ -26 +26 @@
 class BaseObject : public sigslot::has_slots<>
 {
-
+  NewObjectListDeclaration(BaseObject);
 public:
   BaseObject (const std::string& objectName = "");
@@ -49 +49 @@
 
   /** @returns the ID of the Topmost object of the ClassStack */
-  inline int getLeafClassID() const { return _classes.front()._objectList->id(); }
+  inline const int& getLeafClassID() const { return _leafClassID->id(); }
 
   bool isA(const NewObjectListBase& objectList) const;
@@ -88 +88 @@
   std::string                         className;    //!< the name of the class
   ClassList                           _classes;     //!< All Classes this object is part of.
-
+  const NewClassID*                       _leafClassID;  //!< Topmost ClassID.
 };
 
@@ -104 +104 @@
 inline void BaseObject::registerObject(T* object, NewObjectList<T>& objectList)
 {
+  this->_leafClassID = &objectList.identity();
   this->_classes.push_front(ClassEntry(&objectList, objectList.registerObject(object)));
 }

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

@@ -17 +17 @@
   NewClassID(int id, const std::string& name) : _id(id), _name(name) { };
   // the copy constructor is also defined.
-  int id() const { return _id; };
+  const int& id() const { return _id; };
   const std::string& name() const { return _name; };
 
@@ -23 +23 @@
   bool operator==(int id) const { return _id == id; };
   bool operator==(const std::string& name) const { return _name == name; };
+  bool operator!=(NewClassID id) const { return _id != id._id && _name != id._name; };
+  bool operator!=(int id) const { return _id != id; };
+  bool operator!=(const std::string& name) const { return _name != name; };
 
 private:

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

@@ -25 +25 @@
   public: \
    static inline const NewObjectList<ClassName>& objectList() { return ClassName::_objectList; }; \
-   static inline const NewClassID classID() { return ClassName::_objectList.identity(); }; \
+   static inline const NewClassID& classID() { return ClassName::_objectList.identity(); }; \
   private: \
    static NewObjectList<ClassName> _objectList

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

@@ -27 +27 @@
 DataStream::DataStream()
 {
-  this->setClassID(CL_DATA_STREAM, "DataStream");
   this->upBuffer = new byte[DATA_STREAM_BUFFER_SIZE];
   this->downBuffer = new byte[DATA_STREAM_BUFFER_SIZE];
@@ -37 +36 @@
 DataStream::DataStream(DataStream& inStream, DataStream& outStream)
 {
-    this->setClassID(CL_DATA_STREAM, "DataStream");
+  this->registerObject(this, DataStream::_objectList);
     this->downStream = &outStream;
     this->upStream = &inStream;

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

@@ -30 +30 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_HANDSHAKE, "Handshake");
+  this->registerObject(this, Handshake::_objectList);
 
 

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

@@ -37 +37 @@
 MessageManager::MessageManager ()
 {
-  this->setClassID( CL_MESSAGE_MANAGER, "MessageManager" );
+  this->registerObject(this, MessageManager::_objectList);
   newNumber = 1;
   setSynchronized( true );

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

@@ -31 +31 @@
 {
   /* set the class id for the base object and add ist to class list*/
-  this->setClassID(CL_CONNECTION_MONITOR, "ConnectionMonitor");
+  this->registerObject(this, ConnectionMonitor::_objectList);
 
   this->userId = userId;

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

@@ -46 +46 @@
   : Synchronizeable()
 {
-  this->setClassID(CL_NETWORK_MONITOR, "NetworkMonitor");
+  this->registerObject(this, NetworkMonitor::_objectList);
 
   this->networkStream = networkStream;

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

@@ -274 +274 @@
 NetworkStatsWidget* NetworkStatsWidget::_statsWidget = NULL;
 
-#include "class_list.h"
-
 void NetworkStatsWidget::toggleGUI()
 {
-  BaseObject* bo = NULL;
-  const std::list<BaseObject*>* ls = ClassList::getList(CL_NETWORK_MONITOR);
-  if (ls != NULL && !ls->empty())
-    bo = ls->front();
-
-  if (bo != NULL && NetworkStatsWidget::_statsWidget == NULL)
-  {
-    NetworkStatsWidget::_statsWidget = new NetworkStatsWidget(dynamic_cast<NetworkMonitor*> (bo));
+  NetworkMonitor* monitor;
+  if (!NetworkMonitor::objectList().empty())
+    monitor = NetworkMonitor::objectList().front();
+
+  if (monitor != NULL && NetworkStatsWidget::_statsWidget == NULL)
+  {
+    NetworkStatsWidget::_statsWidget = new NetworkStatsWidget(monitor);
     NetworkStatsWidget::_statsWidget->showAll();
   }

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

@@ -20 +20 @@
 class HostWidget : public OrxGui::GLGuiBox
 {
-  NewObjectListDeclaration(HostWidget);
   public:
     HostWidget(const std::string& name, const IP& ip);
@@ -82 +81 @@
 class NetworkStatsWidget : public OrxGui::GLGuiFixedpositionBox
 {
+  NewObjectListDeclaration(NetworkStatsWidget);
   public:
     static void toggleGUI();

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

@@ -23 +23 @@
 #include "util/loading/factory.h"
 #include "state.h"
-#include "class_list.h"
 #include "debug.h"
 
@@ -59 +58 @@
 
   /* set the class id for the base object */
-  this->setClassID(CL_NETWORK_GAME_MANAGER, "NetworkGameManager");
+  this->registerObject(this, NetworkGameManager::_objectList);
 
   this->setSynchronized(true);
@@ -93 +92 @@
   assert( SharedNetworkData::getInstance()->isMasterServer());
   assert( State::getGameRules() );
-  assert( State::getGameRules()->isA( CL_NETWORK_GAME_RULES ) );
+  assert( State::getGameRules()->isA( NetworkGameRules::classID()) );
 
   NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));
 
   int          team = rules.getTeamForNewUser();
-  ClassID      playableClassId = rules.getPlayableClassId( userId, team );
+  NewClassID   playableClassId = rules.getPlayableClassId( userId, team );
   std::string  playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
   std::string  playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
@@ -106 +105 @@
 
   assert( bo != NULL );
-  assert( bo->isA( CL_PLAYABLE ) );
+  assert( bo->isA( Playable::classID()) );
 
   Playable & playable = *(dynamic_cast<Playable*>(bo));
@@ -131 +130 @@
     stats->setNickName( Preferences::getInstance()->getString( "multiplayer", "nickname", "Server" ) );
 
-  if ( rules.isA( CL_MULTIPLAYER_TEAM_DEATHMATCH ) )
+  if ( rules.isA( MultiplayerTeamDeathmatch::classID()) )
     dynamic_cast<MultiplayerTeamDeathmatch*>(&rules)->respawnPlayable( &playable, team, 0.0f );
 
@@ -187 +186 @@
   }
 
-  const std::list<BaseObject*> * list = ClassList::getList( CL_SYNCHRONIZEABLE );
-
-  for ( std::list<BaseObject*>::const_iterator it = list->begin(); it != list->end(); it++ )
-  {
-    if ( dynamic_cast<Synchronizeable*>(*it)->getUniqueID() == uniqueId )
+  for (NewObjectList<Synchronizeable>::const_iterator it = Synchronizeable::objectList().begin();
+       it != Synchronizeable::objectList().end();
+      ++it)
+  {
+    if ( (*it)->getUniqueID() == uniqueId )
     {
-      if ( (*it)->isA(CL_PLAYABLE) )
+      if ( (*it)->isA(Playable::classID()) )
       {
         getInstance()->playablesToDelete.push_back( dynamic_cast<Playable*>(*it) );
@@ -199 +198 @@
       }
 
-      delete dynamic_cast<Synchronizeable*>(*it);
+      delete (*it);
       return true;
     }
@@ -297 +296 @@
     if ( State::getPlayer()->getPlayable() != *it )
     {
-      const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );
-
-      if ( list && std::find( list->begin(), list->end(), *it ) != list->end() )
+      if ( std::find( Playable::objectList().begin(), Playable::objectList().end(), *it ) != Playable::objectList().end() )
       {
         PRINTF(0)("Delete unused playable: %s owner: %d\n", (*it)->getClassCName(), (*it)->getOwner() );
@@ -324 +321 @@
 
   assert( State::getGameRules() );
-  assert( State::getGameRules()->isA( CL_NETWORK_GAME_RULES ) );
+  assert( State::getGameRules()->isA( NetworkGameRules::classID()) );
 
   NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));

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

@@ -20 +20 @@
 #define DEBUG_MODULE_NETWORK
 
-#include "class_list.h"
 #include "debug.h"
 #include "shell_command.h"
@@ -50 +49 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_NETWORK_MANAGER, "NetworkManager");
+  this->registerObject(this, NetworkManager::_objectList);
   PRINTF(0)("START\n");
 

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

@@ -35 +35 @@
 
 
-NewObjectListDefinition(NetworkManager);
+NewObjectListDefinition(NetworkProtocol);
 /**
   standard constructor
@@ -42 +42 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_NETWORK_PROTOCOL, "NetworkProtocol");
+  this->registerObject(this, NetworkProtocol::_objectList);
   this->headerLength = INTSIZE+FLOATSIZE;
 }

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

@@ -45 +45 @@
 
 #include "debug.h"
-#include "class_list.h"
-#include <algorithm>
-
 
 #include "network_stream.h"
@@ -118 +115 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_NETWORK_STREAM, "NetworkStream");
+  this->registerObject(this, NetworkStream::_objectList);
   this->clientSocket = NULL;
   this->clientSoftSocket = NULL;
@@ -970 +967 @@
 
       // if handshake not finished only sync handshake
-      if ( peer->second.handshake && sync.getLeafClassID() != CL_HANDSHAKE )
+      if ( peer->second.handshake && Handshake::classID() != sync.getLeafClassID())
         continue;
 
@@ -976 +973 @@
       if ( ( SharedNetworkData::getInstance()->isMasterServer() ||
              SharedNetworkData::getInstance()->isProxyServerActive() &&  peer->second.isClient())
-             && sync.getLeafClassID() == CL_HANDSHAKE && sync.getUniqueID() != peer->second.userId )
+             && Handshake::classID() == sync.getLeafClassID() && sync.getUniqueID() != peer->second.userId )
         continue;
 
       /* list of synchronizeables that will never be synchronized over the network: */
       // do not sync null parent
-      if ( sync.getLeafClassID() == CL_NULL_PARENT )
+      if ( NullParent::classID() == sync.getLeafClassID())
         continue;
 
@@ -1190 +1187 @@
           /* These are some small exeptions in creation: Not all objects can/should be created via Factory */
           /* Exception 1: NullParent */
-          if( leafClassId == CL_NULL_PARENT || leafClassId == CL_SYNCHRONIZEABLE || leafClassId == CL_NETWORK_GAME_MANAGER )
+          if( NullParent::classID() == leafClassId || Synchronizeable::classID() == leafClassId || NetworkGameManager::classID() == leafClassId)
           {
             PRINTF(1)("Don't create Object with ID %x, ignored!\n", (int)leafClassId);
@@ -1197 +1194 @@
           }
           else
-            b = Factory::fabricate( (ClassID)leafClassId );
+            b = Factory::fabricate( leafClassId );
 
           if ( !b )
@@ -1206 +1203 @@
           }
 
-          if ( b->isA(CL_SYNCHRONIZEABLE) )
+          if ( b->isA(Synchronizeable::classID()) )
           {
             sync = dynamic_cast<Synchronizeable*>(b);

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

@@ -16 +16 @@
 #include "player_stats.h"
 
-#include "class_list.h"
 #include "src/lib/util/loading/factory.h"
 
 #include "player.h"
+#include "playable.h"
 #include "state.h"
 #include "shared_network_data.h"
@@ -55 +55 @@
 void PlayerStats::init( )
 {
-  this->setClassID( CL_PLAYER_STATS, "PlayerStats" );
+  this->registerObject(this, PlayerStats::_objectList);
 
   this->assignedUserId = 0;
@@ -123 +123 @@
 PlayerStats * PlayerStats::getStats( int userId )
 {
-  const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYER_STATS );
-
-  if ( !list )
-  {
-    return NULL;
-  }
-
-  for ( std::list<BaseObject*>::const_iterator it = list->
-        begin();
-        it != list->end();
-        it++ )
-  {
-
-
-    if ( dynamic_cast<PlayerStats*>(*it)->getAssignedUserId() == userId )
+  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+       it != PlayerStats::objectList().end();
+       ++it)
+  {
+    if ( (*it)->getAssignedUserId() == userId )
     {
-      return dynamic_cast<PlayerStats*>(*it);
+      return (*it);
     }
   }
@@ -151 +141 @@
 void PlayerStats::setPlayableUniqueId( int uniqueId )
 {
-  const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYABLE );
-
-  if ( !list )
-  {
-    this->playableUniqueId = uniqueId;
-    return;
-  }
-
   this->playable = NULL;
-  for ( std::list<BaseObject*>::const_iterator it = list->
-        begin();
-        it != list->end();
-        it++ )
-  {
-    if ( dynamic_cast<Playable*>(*it)->
-         getUniqueID() == uniqueId )
+  for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+       it != Playable::objectList().end();
+       ++it)
+  {
+    if ( (*it)->getUniqueID() == uniqueId )
     {
-      this->playable = dynamic_cast<Playable*>(*it);
+      this->playable = (*it);
       //TODO when OM_PLAYERS is ticked add line:
       //this->playable->toList( OM_PLAYERS );
@@ -175 +155 @@
   }
 
-  if ( this->playable && this->assignedUserId == SharedNetworkData::getInstance()
-       ->getHostID() )
+  if ( this->playable && this->assignedUserId == SharedNetworkData::getInstance()->getHostID() )
   {
     State::getPlayer()->setPlayable( this->playable );
@@ -273 +252 @@
 void PlayerStats::deleteAllPlayerStats( )
 {
-  const std::list<BaseObject*> * list;
-
-  while ( (list  = ClassList::getList( CL_PLAYER_STATS )) != NULL && list->begin() != list->end() )
-    delete *list->begin();
+
+  while(!PlayerStats::objectList().empty())
+    delete PlayerStats::objectList().front();
 }
 
@@ -288 +266 @@
   ScoreList result;
 
-  const std::list<BaseObject*> * list = ClassList::getList( CL_PLAYER_STATS );
-
-  if ( !list )
-  {
-    return result;
-  }
-
-  for ( std::list<BaseObject*>::const_iterator it = list->
-        begin();
-        it != list->end();
-        it++ )
-  {
-    PlayerStats & stats = *dynamic_cast<PlayerStats*>(*it);
+  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+       it != PlayerStats::objectList().end();
+       ++it)
+  {
+    PlayerStats& stats = *(*it);
 
     TeamScoreList::iterator it = result[stats.getTeamId()].begin();

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

@@ -58 +58 @@
 
     inline int getPlayableClassId(){ return playableClassId; }
-    void setPlayableClassId( int classId ){ this->playableClassId = classId; };
+    void setPlayableClassId( const NewClassID& classId ){ this->playableClassId = classId.id(); };
 
     inline int getPlayableUniqueId(){ return playableUniqueId; }

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

@@ -37 +37 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_NETWORK_SETTINGS, "NetworkSettings");
+  this->registerObject(this, NetworkSettings::_objectList);
 
   // suggest a good standard max players value

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

@@ -15 +15 @@
 #include "proxy_control.h"
 
-#include "class_list.h"
 #include "shell_command.h"
 
@@ -48 +47 @@
 ProxyControl::ProxyControl()
 {
-  this->setClassID( CL_PROXY_CONTROL, "ProxyControl" );
+  this->registerObject(this, ProxyControl::_objectList);
 
   this->setSynchronized(false);

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

@@ -34 +34 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_SHARED_NETWORK_DATA, "SharedNetworkData");
+  this->registerObject(this, SharedNetworkData::_objectList);
 
   this->nodeType = NET_MASTER_SERVER;

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

@@ -75 +75 @@
     // remove the message manager only by the server
     if ( (SharedNetworkData::getInstance()->isMasterServer() )
-           && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( CL_MESSAGE_MANAGER ) )
+          && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( MessageManager::classID() ) )
       NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );
   }

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

@@ -49 +49 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_SERVER_SOCKET, "TcpServerSocket");
+  this->registerObject(this, TcpServerSocket::_objectList);
 
   terminateThread = false;

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

@@ -61 +61 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_NETWORK_SOCKET, "TcpSocket");
+  this->registerObject(this, TcpSocket::_objectList);
 
   tcpSocket = NULL;

branches/new_class_id/src/lib/network/udp_broadcast.cc

@@ -18 +18 @@
 #include "udp_broadcast.h"
 
-NewObjectListDefinition(UdpBroadcast);
 /**
  * standard constructor

branches/new_class_id/src/lib/network/udp_broadcast.h

@@ -15 +15 @@
 class UdpBroadcast
 {
-  NewObjectListDeclaration(UdpBroadcast);
   public:
     UdpBroadcast();

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

@@ -165 +165 @@
   return NULL;
 }
+
+
+/**
+ * @brief Creates a new Object of type classID
+ * @param classID the ClassID to match for the newly created Object
+ * @returns a new Object of Type classID on match, NULL otherwise
+ */
+BaseObject* Factory::fabricate(const NewClassID& classID)
+{
+  Factory::fabricate(classID.id());
+}

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

@@ -47 +47 @@
 
   static  BaseObject* fabricate(const std::string& className);
+  static  BaseObject* fabricate(const NewClassID& classID);
   static  BaseObject* fabricate(int classID);
   static  BaseObject* fabricate(const TiXmlElement* root = NULL);

branches/new_class_id/src/util/multiplayer_team_deathmatch.h

@@ -38 +38 @@
 
     virtual int getTeamForNewUser();
-    virtual ClassID getPlayableClassId( int userId, int team );
-    virtual std::string getPlayableModelTextureFileName( int userId, int team, ClassID classId );
-    virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
-    virtual float getPlayableScale( int userId, int team, ClassID classId );
+    virtual const NewClassID& getPlayableClassId( int userId, int team );
+    virtual std::string getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId );
+    virtual std::string getPlayableModelFileName( int userId, int team, const NewClassID& classId );
+    virtual float getPlayableScale( int userId, int team, const NewClassID& classId );
 
     virtual void registerSpawn( WorldEntity * we );
@@ -50 +50 @@
     inline void setDeathPenaltyTimeout(float time) { this->deathTimeout = time; }
     inline void setMaxKills(int kills) { this->maxKills = kills; }
-    
+
     inline void setNumTeams( int numTeams ){ this->numTeams = numTeams; }
     inline int getNumTeams(){ return this->numTeams; }
-    
+
     int getRandomTeam();
-    
+
     virtual void process(const Event &event);
-    
+
     void onKill( WorldEntity * victim, WorldEntity * killer );
     void onRespawn( int userId );
-    
+
     virtual void handleChatMessage( int userId, const std::string & message, int messageType );
-    
+
     void respawnPlayable( Playable * playable, int teamId, float delay );
 
@@ -84 +84 @@
 
     OrxGui::GLGuiBox* box;
-    
+
     OrxGui::GLGuiInputLine* input;
-    
+
     void calculateTeamScore();
     void nextGameState();
@@ -92 +92 @@
     void teamChange( int userId );
     void assignPlayable();
-    
+
     void onButtonSpectator();
     void onButtonRandom();
@@ -99 +99 @@
     void onButtonCancel();
     void onButtonExit();
-    
+
     void onInputEnter( const std::string & text );
-    
+
     OrxGui::GLGuiBox* statsBox;
     OrxGui::GLGuiTable* table;
     void tickStatsTable();
-    
+
     void showStats();
     void hideStats();

branches/new_class_id/src/util/network_game_rules.h

@@ -19 +19 @@
     NetworkGameRules( const TiXmlElement* root );
     virtual ~NetworkGameRules();
-    
+
     virtual int getTeamForNewUser();
-    virtual ClassID getPlayableClassId( int userId, int team );
-    virtual std::string getPlayableModelFileName( int userId, int team, ClassID classId );
-    virtual std::string getPlayableModelTextureFileName( int userId, int team, ClassID classId );
-    virtual float getPlayableScale( int userId, int team, ClassID classId );
-    
+    virtual const NewClassID& getPlayableClassId( int userId, int team );
+    virtual std::string getPlayableModelFileName( int userId, int team, const NewClassID& classId );
+    virtual std::string getPlayableModelTextureFileName( int userId, int team, const NewClassID& classId );
+    virtual float getPlayableScale( int userId, int team, const NewClassID& classId );
+
     virtual PlayerStats * getNewPlayerStats( int userId ){ return new PlayerStats( userId ); }
-    
+
     virtual void handleChatMessage( int userId, const std::string & message, int messageType ) = 0;
-    
+
     void shellSay( const std::string & message );
 

branches/new_class_id/src/world_entities/playable.cc

@@ -41 +41 @@
 SHELL_COMMAND_STATIC(orxoWeapon, Playable, Playable::addSomeWeapons_CHEAT)
   ->setAlias("orxoWeapon");
-
+NewObjectListDefinition(Playable)
 
 Playable::Playable()
@@ -48 +48 @@
     playmode(Playable::Full3D)
 {
-  this->setClassID(CL_PLAYABLE, "Playable");
+  this->registerObject(this, Playable::_classID);
   PRINTF(4)("PLAYABLE INIT\n");
 

branches/new_class_id/src/world_entities/playable.h

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