Changeset 9869 in orxonox.OLD for trunk/src/lib/network

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/lib/network

Files:

• converter.cc (modified) (1 diff)
• converter.h (modified) (1 diff)
• data_stream.cc (modified) (3 diffs)
• data_stream.h (modified) (1 diff)
• handshake.cc (modified) (2 diffs)
• handshake.h (modified) (1 diff)
• message_manager.cc (modified) (2 diffs)
• message_manager.h (modified) (1 diff)
• monitor/connection_monitor.cc (modified) (2 diffs)
• monitor/connection_monitor.h (modified) (1 diff)
• monitor/network_monitor.cc (modified) (2 diffs)
• monitor/network_monitor.h (modified) (1 diff)
• monitor/network_stats_widget.cc (modified) (5 diffs)
• monitor/network_stats_widget.h (modified) (1 diff)
• network_game_manager.cc (modified) (10 diffs)
• network_game_manager.h (modified) (1 diff)
• network_log.cc (modified) (12 diffs)
• network_log.h (modified) (1 diff)
• network_manager.cc (modified) (4 diffs)
• network_manager.h (modified) (1 diff)
• network_protocol.cc (modified) (2 diffs)
• network_protocol.h (modified) (1 diff)
• network_socket.cc (modified) (1 diff)
• network_socket.h (modified) (1 diff)
• network_stream.cc (modified) (9 diffs)
• network_stream.h (modified) (1 diff)
• player_stats.cc (modified) (8 diffs)
• player_stats.h (modified) (2 diffs)
• proxy/network_settings.cc (modified) (3 diffs)
• proxy/network_settings.h (modified) (1 diff)
• proxy/proxy_control.cc (modified) (4 diffs)
• proxy/proxy_control.h (modified) (1 diff)
• server_socket.cc (modified) (1 diff)
• server_socket.h (modified) (1 diff)
• shared_network_data.cc (modified) (2 diffs)
• shared_network_data.h (modified) (1 diff)
• synchronizeable.cc (modified) (3 diffs)
• synchronizeable.h (modified) (1 diff)
• tcp_server_socket.cc (modified) (2 diffs)
• tcp_server_socket.h (modified) (1 diff)
• tcp_socket.cc (modified) (6 diffs)
• tcp_socket.h (modified) (1 diff)
• udp_broadcast.cc (modified) (5 diffs)
• udp_broadcast.h (modified) (1 diff)
• udp_server_socket.cc (modified) (1 diff)
• udp_server_socket.h (modified) (1 diff)
• udp_socket.cc (modified) (1 diff)
• udp_socket.h (modified) (1 diff)
• zip.cc (modified) (2 diffs)

trunk/src/lib/network/converter.cc

@@ -28 +28 @@
 SHELL_COMMAND_STATIC(debug, Converter, Converter::debug);
 
-
+ObjectListDefinition(Converter);
 /* using namespace std is default, this needs to be here */
 

trunk/src/lib/network/converter.h

@@ -24 +24 @@
 class Converter : public BaseObject
 {
+  ObjectListDeclaration(Converter);
   public:
     static byte* intToByteArray(int x);

trunk/src/lib/network/data_stream.cc

@@ -20 +20 @@
 /* using namespace std is default, this needs to be here */
 
-
-
+ObjectListDefinition(DataStream);
 
 /**
@@ -28 +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];
@@ -38 +36 @@
 DataStream::DataStream(DataStream& inStream, DataStream& outStream)
 {
-    this->setClassID(CL_DATA_STREAM, "DataStream");
+  this->registerObject(this, DataStream::_objectList);
     this->downStream = &outStream;
     this->upStream = &inStream;

trunk/src/lib/network/data_stream.h

@@ -17 +17 @@
 class DataStream : public BaseObject
 {
-      public:
+  ObjectListDeclaration(DataStream);
+  public:
       DataStream();
       DataStream(DataStream& inStream, DataStream& outStream);

trunk/src/lib/network/handshake.cc

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

trunk/src/lib/network/handshake.h

@@ -42 +42 @@
 class Handshake : public Synchronizeable
 {
-
+  ObjectListDeclaration(Handshake);
   public:
     Handshake( int nodeType, int clientId = 0, int networkGameManagerId = 0, int messageManagerId = 0 );

trunk/src/lib/network/message_manager.cc

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

trunk/src/lib/network/message_manager.h

@@ -96 +96 @@
 class MessageManager : public Synchronizeable {
 
-
+  ObjectListDeclaration(MessageManager);
  public:
    inline static MessageManager * getInstance(){ if (!singletonRef) singletonRef = new MessageManager();  return singletonRef; }

trunk/src/lib/network/monitor/connection_monitor.cc

@@ -23 +23 @@
 /* using namespace std is default, this needs to be here */
 
-
+ObjectListDefinition(ConnectionMonitor);
 /**
  * constructor
@@ -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;

trunk/src/lib/network/monitor/connection_monitor.h

@@ -19 +19 @@
 class ConnectionMonitor : virtual public BaseObject
 {
+  ObjectListDeclaration(ConnectionMonitor);
   public:
     ConnectionMonitor( int userId );

trunk/src/lib/network/monitor/network_monitor.cc

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

trunk/src/lib/network/monitor/network_monitor.h

@@ -27 +27 @@
 class NetworkMonitor : public Synchronizeable
 {
-
+  ObjectListDeclaration(NetworkMonitor);
   public:
     NetworkMonitor(NetworkStream* networkStream);

trunk/src/lib/network/monitor/network_stats_widget.cc

@@ -20 +20 @@
 #include "peer_info.h"
 
+#include "loading/resource_manager.h"
+
 #include "multi_type.h"
 
 #include "shell_command.h"
-
-#include "loading/resource_manager.h"
 
 // this fcuk does not work!
@@ -30 +30 @@
 // ->setAlias("ProxyGui");
 
-
 HostWidget::HostWidget(const std::string& name, const IP& ip)
     : GLGuiBox(OrxGui::Horizontal)
@@ -57 +56 @@
 {
   if(_font == NULL)
-    _font = new Font(ResourceManager::getInstance()->getDataDir() + "/fonts/arial.ttf", 20);
+    _font = new Font(Resources::ResourceManager::getInstance()->mainGlobalPath().name() + "/fonts/arial.ttf", 20);
 
   //this->_name.setFont(*_font);
@@ -211 +210 @@
 //======================================================//
 
+
+ObjectListDefinition(NetworkStatsWidget);
 /**
  * @brief standard constructor
@@ -273 +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();
   }

trunk/src/lib/network/monitor/network_stats_widget.h

@@ -81 +81 @@
 class NetworkStatsWidget : public OrxGui::GLGuiFixedpositionBox
 {
+  ObjectListDeclaration(NetworkStatsWidget);
   public:
     static void toggleGUI();

trunk/src/lib/network/network_game_manager.cc

@@ -23 +23 @@
 #include "util/loading/factory.h"
 #include "state.h"
-#include "class_list.h"
 #include "debug.h"
 
@@ -43 +42 @@
 #include "multiplayer_team_deathmatch.h"
 
-#include "preferences.h"
-
-
-
-
+#include "parser/preferences/preferences.h"
+
+
+
+ObjectListDefinition(NetworkGameManager);
 NetworkGameManager* NetworkGameManager::singletonRef = NULL;
 
@@ -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::staticClassID()) );
 
   NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));
 
   int          team = rules.getTeamForNewUser();
-  ClassID      playableClassId = rules.getPlayableClassId( userId, team );
+  ClassID   playableClassId = rules.getPlayableClassId( userId, team );
   std::string  playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
   std::string  playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
@@ -106 +105 @@
 
   assert( bo != NULL );
-  assert( bo->isA( CL_PLAYABLE ) );
+  assert( bo->isA( Playable::staticClassID()) );
 
   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::staticClassID()) )
     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 (ObjectList<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::staticClassID()) )
       {
         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::staticClassID()) );
 
   NetworkGameRules & rules = *(dynamic_cast<NetworkGameRules*>(State::getGameRules()));

trunk/src/lib/network/network_game_manager.h

@@ -33 +33 @@
 class NetworkGameManager: public Synchronizeable
 {
-
+  ObjectListDeclaration(NetworkGameManager);
   public:
     virtual ~NetworkGameManager();
 
-    static NetworkGameManager* NetworkGameManager::getInstance()
+    static NetworkGameManager* getInstance()
     { if (!NetworkGameManager::singletonRef) NetworkGameManager::singletonRef = new NetworkGameManager(); return NetworkGameManager::singletonRef; }
 

trunk/src/lib/network/network_log.cc

@@ -15 +15 @@
 
 #include "network_log.h"
+#include <cassert>
 
 /**
@@ -53 +54 @@
     return false;
   }
-  
+
   listensock = SDLNet_TCP_Open( &ip );
-  
+
   if( !listensock ) {
     PRINT(1)( "SDLNet_TCP_Open: %s\n", SDLNet_GetError() );
     return false;
-  } 
+  }
 
   return true;
@@ -71 +72 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
- 
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   printfnet();
 }
@@ -85 +86 @@
 {
   TCPsocket newSock = SDLNet_TCP_Accept( listensock );
-  
+
   if ( newSock )
     sockets.push_back( newSock );
@@ -97 +98 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(0)( buf );
   printfnet();
@@ -114 +115 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(1)( buf );
   printfnet();
@@ -131 +132 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(2)( buf );
   printfnet();
@@ -148 +149 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(3)( buf );
   printfnet();
@@ -165 +166 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(4)( buf );
   printfnet();
@@ -182 +183 @@
   va_list ap;
   va_start( ap, format );
-  
-  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
-  
-  va_end( ap );
-  
+
+  assert( vsnprintf( buf, NETWORK_LOG_BUFLEN, format, ap ) < NETWORK_LOG_BUFLEN );
+
+  va_end( ap );
+
   PRINT(5)( buf );
   printfnet();
@@ -200 +201 @@
   if ( !listensock )
     return;
-  
+
   acceptNewConnections();
 
@@ -213 +214 @@
       continue;
     }
-    
+
     it++;
   }

trunk/src/lib/network/network_log.h

@@ -38 +38 @@
 class NetworkLog
 {
-
   public:
     virtual ~NetworkLog(void);

trunk/src/lib/network/network_manager.cc

@@ -20 +20 @@
 #define DEBUG_MODULE_NETWORK
 
-#include "class_list.h"
 #include "debug.h"
 #include "shell_command.h"
@@ -28 +27 @@
 #include "shared_network_data.h"
 #include "network_stream.h"
-#include "preferences.h"
+#include "parser/preferences/preferences.h"
 #include "network_log.h"
 #include "network_game_manager.h"
@@ -41 +40 @@
 
 
-
+ObjectListDefinition(NetworkManager);
 NetworkManager* NetworkManager::singletonRef = NULL;
 
@@ -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");
 

trunk/src/lib/network/network_manager.h

@@ -25 +25 @@
 class NetworkManager : public BaseObject
 {
-
+  ObjectListDeclaration(NetworkManager);
   public:
 

trunk/src/lib/network/network_protocol.cc

@@ -35 +35 @@
 
 
-
+ObjectListDefinition(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;
 }

trunk/src/lib/network/network_protocol.h

@@ -25 +25 @@
 class NetworkProtocol : virtual public BaseObject
 {
+  ObjectListDeclaration(NetworkProtocol);
   public:
     NetworkProtocol();

trunk/src/lib/network/network_socket.cc

@@ -24 +24 @@
 #include "network_socket.h"
 
-/* header for debug output */
-#include "debug.h"
-
+ObjectListDefinition(NetworkSocket);
 /**
  * Default constructor

trunk/src/lib/network/network_socket.h

@@ -17 +17 @@
 class NetworkSocket : public BaseObject
 {
+  ObjectListDeclaration(NetworkSocket);
   public:
     NetworkSocket();

trunk/src/lib/network/network_stream.cc

@@ -33 +33 @@
 #include "shared_network_data.h"
 #include "message_manager.h"
-#include "preferences.h"
+#include "parser/preferences/preferences.h"
 #include "zip.h"
 
-#include "src/lib/util/loading/resource_manager.h"
-
 #include "network_log.h"
 
 #include "player_stats.h"
 
-#include "lib/util/loading/factory.h"
+#include "loading/factory.h"
+#include "loading/resource_manager.h"
 
 #include "debug.h"
-#include "class_list.h"
-#include <algorithm>
-
 
 #include "network_stream.h"
@@ -57 +53 @@
 #define PACKAGE_SIZE  256
 
-
+ObjectListDefinition(NetworkStream);
 /**
  * empty constructor
@@ -118 +114 @@
 {
   /* 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 +966 @@
 
       // if handshake not finished only sync handshake
-      if ( peer->second.handshake && sync.getLeafClassID() != CL_HANDSHAKE )
+      if ( peer->second.handshake && Handshake::staticClassID() != sync.getLeafClassID())
         continue;
 
@@ -976 +972 @@
       if ( ( SharedNetworkData::getInstance()->isMasterServer() ||
              SharedNetworkData::getInstance()->isProxyServerActive() &&  peer->second.isClient())
-             && sync.getLeafClassID() == CL_HANDSHAKE && sync.getUniqueID() != peer->second.userId )
+             && Handshake::staticClassID() == 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::staticClassID() == sync.getLeafClassID())
         continue;
 
@@ -1190 +1186 @@
           /* 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::staticClassID() == leafClassId || Synchronizeable::staticClassID() == leafClassId || NetworkGameManager::staticClassID() == leafClassId)
           {
             PRINTF(1)("Don't create Object with ID %x, ignored!\n", (int)leafClassId);
@@ -1197 +1193 @@
           }
           else
-            b = Factory::fabricate( (ClassID)leafClassId );
+            ; /// FIXME CLASS_ID :: b = Factory::fabricate( leafClassId );
 
           if ( !b )
@@ -1206 +1202 @@
           }
 
-          if ( b->isA(CL_SYNCHRONIZEABLE) )
+          if ( b->isA(Synchronizeable::staticClassID()) )
           {
             sync = dynamic_cast<Synchronizeable*>(b);
@@ -1303 +1299 @@
     length = remainingBytesToWriteToDict;
 
-  std::string fileName = ResourceManager::getInstance()->getDataDir();
+  std::string fileName = Resources::ResourceManager::getInstance()->mainGlobalPath().name();
   fileName += "/dicts/newdict";
 

trunk/src/lib/network/network_stream.h

@@ -33 +33 @@
 class NetworkStream : public DataStream
 {
-
+  ObjectListDeclaration(NetworkStream);
   public:
     NetworkStream();

trunk/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"
@@ -25 +25 @@
 #include "converter.h"
 
-#include "preferences.h"
+#include "parser/preferences/preferences.h"
 
 #include "debug.h"
 #include "shell_command.h"
 
-
-CREATE_FACTORY(PlayerStats, CL_PLAYER_STATS);
-
+#include "class_id_DEPRECATED.h"
+
+ObjectListDefinitionID(PlayerStats, CL_PLAYER_STATS);
+CREATE_FACTORY(PlayerStats);
 
 /**
@@ -54 +55 @@
 void PlayerStats::init( )
 {
-  this->setClassID( CL_PLAYER_STATS, "PlayerStats" );
+  this->registerObject(this, PlayerStats::_objectList);
 
   this->assignedUserId = 0;
@@ -122 +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 (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+       it != PlayerStats::objectList().end();
+       ++it)
+  {
+    if ( (*it)->getAssignedUserId() == userId )
     {
-      return dynamic_cast<PlayerStats*>(*it);
+      return (*it);
     }
   }
@@ -150 +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 (ObjectList<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 );
@@ -174 +155 @@
   }
 
-  if ( this->playable && this->assignedUserId == SharedNetworkData::getInstance()
-       ->getHostID() )
+  if ( this->playable && this->assignedUserId == SharedNetworkData::getInstance()->getHostID() )
   {
     State::getPlayer()->setPlayable( this->playable );
@@ -272 +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();
 }
 
@@ -287 +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 (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+       it != PlayerStats::objectList().end();
+       ++it)
+  {
+    PlayerStats& stats = *(*it);
 
     TeamScoreList::iterator it = result[stats.getTeamId()].begin();

trunk/src/lib/network/player_stats.h

@@ -36 +36 @@
 class PlayerStats : public Synchronizeable
 {
-
+  ObjectListDeclaration(PlayerStats);
   public:
     PlayerStats( const TiXmlElement* root = NULL );
@@ -58 +58 @@
 
     inline int getPlayableClassId(){ return playableClassId; }
-    void setPlayableClassId( int classId ){ this->playableClassId = classId; };
+    void setPlayableClassId( const ClassID& classId ){ this->playableClassId = classId.id(); };
 
     inline int getPlayableUniqueId(){ return playableUniqueId; }

trunk/src/lib/network/proxy/network_settings.cc

@@ -21 +21 @@
 #include "shared_network_data.h"
 
+#include "loading/load_param.h"
 #include "loading/resource_manager.h"
-#include "loading/load_param.h"
-
 #include "debug.h"
 
 
+ObjectListDefinition(NetworkSettings);
 
 NetworkSettings* NetworkSettings::singletonRef = NULL;
@@ -36 +36 @@
 {
   /* 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
@@ -64 +64 @@
 void NetworkSettings::loadData()
 {
-  std::string fileName = ResourceManager::getInstance()->getDataDir();
+  std::string fileName = Resources::ResourceManager::getInstance()->mainGlobalPath().name();
   fileName += "configs/network_settings.conf";
 

trunk/src/lib/network/proxy/network_settings.h

@@ -24 +24 @@
 class NetworkSettings : public BaseObject
 {
-
+  ObjectListDeclaration(NetworkSettings);
   public:
     inline static NetworkSettings* getInstance() { if (!NetworkSettings::singletonRef) NetworkSettings::singletonRef = new NetworkSettings();

trunk/src/lib/network/proxy/proxy_control.cc

@@ -15 +15 @@
 #include "proxy_control.h"
 
-#include "class_list.h"
 #include "shell_command.h"
 
@@ -28 +27 @@
 #include "converter.h"
 
-#include "preferences.h"
+#include "parser/preferences/preferences.h"
 
 #include "debug.h"
@@ -41 +40 @@
 
 SHELL_COMMAND(forceReconnect, ProxyControl, forceReconnectionShell);
+ObjectListDefinition(ProxyControl);
 
 /**
@@ -47 +47 @@
 ProxyControl::ProxyControl()
 {
-  this->setClassID( CL_PROXY_CONTROL, "ProxyControl" );
+  this->registerObject(this, ProxyControl::_objectList);
 
   this->setSynchronized(false);

trunk/src/lib/network/proxy/proxy_control.h

@@ -30 +30 @@
 class ProxyControl : public Synchronizeable
 {
-
+  ObjectListDeclaration(ProxyControl);
   public:
     inline static ProxyControl* getInstance() { if (!ProxyControl::singletonRef) ProxyControl::singletonRef = new ProxyControl();

trunk/src/lib/network/server_socket.cc

@@ -23 +23 @@
 #include "server_socket.h"
 
-/* header for debug output */
-#include "debug.h"
-
-
+ObjectListDefinition(ServerSocket);
 /**
  * constructor

trunk/src/lib/network/server_socket.h

@@ -19 +19 @@
 class ServerSocket : public BaseObject
 {
+  ObjectListDeclaration(ServerSocket);
   public:
     ServerSocket( int port);

trunk/src/lib/network/shared_network_data.cc

@@ -25 +25 @@
 
 
-
+ObjectListDefinition(SharedNetworkData);
 SharedNetworkData* SharedNetworkData::singletonRef = NULL;
 
@@ -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;

trunk/src/lib/network/shared_network_data.h

@@ -22 +22 @@
 class SharedNetworkData : public BaseObject
 {
-
+  ObjectListDeclaration(SharedNetworkData);
   public:
     inline static SharedNetworkData* getInstance() { if (!SharedNetworkData::singletonRef) SharedNetworkData::singletonRef = new SharedNetworkData();

trunk/src/lib/network/synchronizeable.cc

@@ -32 +32 @@
 
 
+ObjectListDefinition(Synchronizeable);
 
 /**
@@ -38 +39 @@
 Synchronizeable::Synchronizeable()
 {
-  this->setClassID(CL_SYNCHRONIZEABLE, "Synchronizeable");
+  this->registerObject(this, Synchronizeable::_objectList);
   this->owner = 0;
 //   this->setIsServer(SharedNetworkData::getInstance()->getHostID() == 0);
@@ -74 +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::staticClassID() ) )
       NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );
   }

trunk/src/lib/network/synchronizeable.h

@@ -41 +41 @@
 class Synchronizeable : virtual public BaseObject
 {
+  ObjectListDeclaration(Synchronizeable);
 
   public:

trunk/src/lib/network/tcp_server_socket.cc

@@ -26 +26 @@
 #include "debug.h"
 
+ObjectListDefinition(TcpServerSocket);
 TcpServerSocket::TcpServerSocket( int port ) : ServerSocket( port )
 {
@@ -48 +49 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_SERVER_SOCKET, "TcpServerSocket");
+  this->registerObject(this, TcpServerSocket::_objectList);
 
   terminateThread = false;

trunk/src/lib/network/tcp_server_socket.h

@@ -19 +19 @@
 class TcpServerSocket : public ServerSocket
 {
+  ObjectListDeclaration(TcpServerSocket);
   public:
     TcpServerSocket( int port );

trunk/src/lib/network/tcp_socket.cc

@@ -30 +30 @@
 #include "debug.h"
 
+ObjectListDefinition(TcpSocket);
 /**
  * Default constructor
@@ -60 +61 @@
 {
   /* set the class id for the base object */
-  this->setClassID(CL_NETWORK_SOCKET, "TcpSocket");
+  this->registerObject(this, TcpSocket::_objectList);
 
   tcpSocket = NULL;
@@ -122 +123 @@
 {
   IPaddress ip;
-  
-  bOk = true; 
-  
+
+  bOk = true;
+
   if ( SDLNet_ResolveHost( &ip, host.c_str(), port ) != 0 )
   {
@@ -131 +132 @@
     return;
   }
-  
+
   //check if not already connected or listening
   if (tcpSocket)
@@ -345 +346 @@
 }
 #endif
-  
+
   PRINTF(0)("QUIT READ THREAD\n");
-  
+
   return 0;
 }
@@ -425 +426 @@
 
   return 0;
-  
+
 }
 

trunk/src/lib/network/tcp_socket.h

@@ -40 +40 @@
 class TcpSocket : public NetworkSocket
 {
+  ObjectListDeclaration(TcpSocket);
   public:
     TcpSocket();

trunk/src/lib/network/udp_broadcast.cc

@@ -26 +26 @@
   this->port = 0;
   packet = SDLNet_AllocPacket( BROADCAST_PACKET_SIZE );
-  
-  if ( !packet ) 
+
+  if ( !packet )
   {
     printf( "SDLNet_AllocPacket: %s\n", SDLNet_GetError() );
     assert( packet );
   }
-  
+
   this->socket = NULL;
 }
@@ -47 +47 @@
     this->packet = NULL;
   }
-  
+
   if ( this->socket )
   {
@@ -53 +53 @@
     this->socket = NULL;
   }
-  
+
 }
 
 /**
  * listen for incoming broadcast packets
- * @param port port to listen on 
+ * @param port port to listen on
  * @return true on success
  */
@@ -74 +74 @@
 {
   this->port = port;
-  
+
   return true;
 }
@@ -80 +80 @@
 /**
  * send packet
- * @param data data to send 
+ * @param data data to send
  * @param length length of data
  * @param ip if ip == NULL broadcast is used

trunk/src/lib/network/udp_broadcast.h

@@ -15 +15 @@
 class UdpBroadcast
 {
-
   public:
     UdpBroadcast();
     virtual ~UdpBroadcast();
-    
+
     bool listen( int port );
     bool open( int port );

trunk/src/lib/network/udp_server_socket.cc

@@ -18 +18 @@
 
 
-
+ObjectListDefinition(UdpServerSocket);
 /**
  * constructor

trunk/src/lib/network/udp_server_socket.h

@@ -50 +50 @@
 class UdpServerSocket : public ServerSocket
 {
+  ObjectListDeclaration(UdpServerSocket);
   public:
     UdpServerSocket( int port);

trunk/src/lib/network/udp_socket.cc

@@ -18 +18 @@
 #include "debug.h"
 
+ObjectListDefinition(UdpSocket);
 
 void UdpSocket::init( )

trunk/src/lib/network/udp_socket.h

@@ -24 +24 @@
 class UdpSocket : public NetworkSocket
 {
+  ObjectListDeclaration(UdpSocket);
   public:
     UdpSocket();

trunk/src/lib/network/zip.cc

@@ -15 +15 @@
 
 #include "zip.h"
-
-#include "src/lib/util/loading/resource_manager.h"
+#include "loading/resource_manager.h"
 #include "debug.h"
 
@@ -51 +50 @@
 int Zip::loadDictionary( std::string name )
 {
-  std::string fileName = ResourceManager::getInstance()->getDataDir();
+  std::string fileName = Resources::ResourceManager::getInstance()->mainGlobalPath().name();
   //PRINTF(0)("datadir: %s\n", fileName.c_str());
   fileName = fileName + "/dicts/" + name;