Changeset 9715 in orxonox.OLD for branches/new_class_id/src/lib/network

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/lib/network

Files:

• converter.cc (modified) (1 diff)
• converter.h (modified) (1 diff)
• data_stream.cc (modified) (1 diff)
• data_stream.h (modified) (1 diff)
• handshake.cc (modified) (1 diff)
• handshake.h (modified) (1 diff)
• message_manager.cc (modified) (1 diff)
• message_manager.h (modified) (1 diff)
• monitor/connection_monitor.cc (modified) (1 diff)
• monitor/connection_monitor.h (modified) (1 diff)
• monitor/network_monitor.cc (modified) (1 diff)
• monitor/network_monitor.h (modified) (1 diff)
• monitor/network_stats_widget.cc (modified) (1 diff)
• monitor/network_stats_widget.h (modified) (1 diff)
• network_game_manager.cc (modified) (3 diffs)
• network_game_manager.h (modified) (1 diff)
• network_manager.cc (modified) (1 diff)
• network_manager.h (modified) (1 diff)
• network_protocol.cc (modified) (1 diff)
• network_protocol.h (modified) (1 diff)
• network_socket.cc (modified) (1 diff)
• network_socket.h (modified) (1 diff)
• network_stream.cc (modified) (1 diff)
• network_stream.h (modified) (1 diff)
• player_stats.cc (modified) (4 diffs)
• player_stats.h (modified) (2 diffs)
• proxy/network_settings.cc (modified) (1 diff)
• proxy/network_settings.h (modified) (1 diff)
• proxy/proxy_control.cc (modified) (1 diff)
• proxy/proxy_control.h (modified) (1 diff)
• server_socket.cc (modified) (1 diff)
• server_socket.h (modified) (1 diff)
• shared_network_data.cc (modified) (1 diff)
• shared_network_data.h (modified) (1 diff)
• synchronizeable.cc (modified) (1 diff)
• synchronizeable.h (modified) (1 diff)
• tcp_server_socket.cc (modified) (1 diff)
• tcp_server_socket.h (modified) (1 diff)
• tcp_socket.cc (modified) (1 diff)
• tcp_socket.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)

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

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

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

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

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

@@ -20 +20 @@
 /* using namespace std is default, this needs to be here */
 
-NewObjectListDefinition(DataStream);
+ObjectListDefinition(DataStream);
 
 /**

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

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

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

@@ -23 +23 @@
 
 
-NewObjectListDefinition(Handshake);
+ObjectListDefinition(Handshake);
 
 

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

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

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

@@ -28 +28 @@
 
 
-NewObjectListDefinition(MessageManager);
+ObjectListDefinition(MessageManager);
 MessageManager* MessageManager::singletonRef = NULL;
 

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

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

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

@@ -23 +23 @@
 /* using namespace std is default, this needs to be here */
 
-NewObjectListDefinition(ConnectionMonitor);
+ObjectListDefinition(ConnectionMonitor);
 /**
  * constructor

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

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

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

@@ -37 +37 @@
 SHELL_COMMAND(debug, NetworkMonitor, debug);
 
-NewObjectListDefinition(NetworkMonitor);
+ObjectListDefinition(NetworkMonitor);
 
 

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

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

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

@@ -211 +211 @@
 
 
-NewObjectListDefinition(NetworkStatsWidget);
+ObjectListDefinition(NetworkStatsWidget);
 /**
  * @brief standard constructor

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

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

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

@@ -46 +46 @@
 
 
-NewObjectListDefinition(NetworkGameManager);
+ObjectListDefinition(NetworkGameManager);
 NetworkGameManager* NetworkGameManager::singletonRef = NULL;
 
@@ -97 +97 @@
 
   int          team = rules.getTeamForNewUser();
-  NewClassID   playableClassId = rules.getPlayableClassId( userId, team );
+  ClassID   playableClassId = rules.getPlayableClassId( userId, team );
   std::string  playableModel = rules.getPlayableModelFileName( userId, team, playableClassId );
   std::string  playableTexture = rules.getPlayableModelFileName( userId, team, playableClassId );
@@ -186 +186 @@
   }
 
-  for (NewObjectList<Synchronizeable>::const_iterator it = Synchronizeable::objectList().begin();
+  for (ObjectList<Synchronizeable>::const_iterator it = Synchronizeable::objectList().begin();
        it != Synchronizeable::objectList().end();
       ++it)

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

@@ -33 +33 @@
 class NetworkGameManager: public Synchronizeable
 {
-  NewObjectListDeclaration(NetworkGameManager);
+  ObjectListDeclaration(NetworkGameManager);
   public:
     virtual ~NetworkGameManager();

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

@@ -40 +40 @@
 
 
-NewObjectListDefinition(NetworkManager);
+ObjectListDefinition(NetworkManager);
 NetworkManager* NetworkManager::singletonRef = NULL;
 

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

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

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

@@ -35 +35 @@
 
 
-NewObjectListDefinition(NetworkProtocol);
+ObjectListDefinition(NetworkProtocol);
 /**
   standard constructor

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

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

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

@@ -24 +24 @@
 #include "network_socket.h"
 
-NewObjectListDefinition(NetworkSocket);
+ObjectListDefinition(NetworkSocket);
 /**
  * Default constructor

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

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

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

@@ -54 +54 @@
 #define PACKAGE_SIZE  256
 
-NewObjectListDefinition(NetworkStream);
+ObjectListDefinition(NetworkStream);
 /**
  * empty constructor

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

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

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

@@ -32 +32 @@
 #include "class_id.h"
 
-NewObjectListDefinitionID(PlayerStats, CL_PLAYER_STATS);
+ObjectListDefinitionID(PlayerStats, CL_PLAYER_STATS);
 CREATE_FACTORY(PlayerStats);
 
@@ -123 +123 @@
 PlayerStats * PlayerStats::getStats( int userId )
 {
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)
@@ -142 +142 @@
 {
   this->playable = NULL;
-  for (NewObjectList<Playable>::const_iterator it = Playable::objectList().begin();
+  for (ObjectList<Playable>::const_iterator it = Playable::objectList().begin();
        it != Playable::objectList().end();
        ++it)
@@ -266 +266 @@
   ScoreList result;
 
-  for (NewObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
+  for (ObjectList<PlayerStats>::const_iterator it = PlayerStats::objectList().begin();
        it != PlayerStats::objectList().end();
        ++it)

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

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

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

@@ -27 +27 @@
 
 
-NewObjectListDefinition(NetworkSettings);
+ObjectListDefinition(NetworkSettings);
 
 NetworkSettings* NetworkSettings::singletonRef = NULL;

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

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

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

@@ -40 +40 @@
 
 SHELL_COMMAND(forceReconnect, ProxyControl, forceReconnectionShell);
-NewObjectListDefinition(ProxyControl);
+ObjectListDefinition(ProxyControl);
 
 /**

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

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

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

@@ -23 +23 @@
 #include "server_socket.h"
 
-NewObjectListDefinition(ServerSocket);
+ObjectListDefinition(ServerSocket);
 /**
  * constructor

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

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

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

@@ -25 +25 @@
 
 
-NewObjectListDefinition(SharedNetworkData);
+ObjectListDefinition(SharedNetworkData);
 SharedNetworkData* SharedNetworkData::singletonRef = NULL;
 

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

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

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

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

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

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

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

@@ -26 +26 @@
 #include "debug.h"
 
-NewObjectListDefinition(TcpServerSocket);
+ObjectListDefinition(TcpServerSocket);
 TcpServerSocket::TcpServerSocket( int port ) : ServerSocket( port )
 {

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

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

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

@@ -30 +30 @@
 #include "debug.h"
 
-NewObjectListDefinition(TcpSocket);
+ObjectListDefinition(TcpSocket);
 /**
  * Default constructor

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

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

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

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

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

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

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

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

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

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