Changeset 1785

Timestamp:

Sep 15, 2008, 10:59:54 AM (16 years ago)

Author:

rgrieder

Message:

replaced the macro constants with c++'s idea of constants in network library.

Location:

code/trunk/src/network

Files:

• ClientConnection.h (modified) (1 diff)
• ConnectionManager.h (modified) (1 diff)
• GamestateManager.h (modified) (1 diff)
• Server.cc (modified) (1 diff)
• Server.h (modified) (1 diff)

code/trunk/src/network/ClientConnection.h

@@ -53 +53 @@
 {
 
-#define NETWORK_PORT 55556
-#define NETWORK_CLIENT_MAX_CONNECTIONS 5
-#define NETWORK_CLIENT_WAIT_TIME 1
-#define NETWORK_CLIENT_CONNECT_TIMEOUT 3000 // miliseconds
-#define NETWORK_CLIENT_CHANNELS 2
+    const int NETWORK_PORT = 55556;
+    const int NETWORK_CLIENT_MAX_CONNECTIONS = 5;
+    const int NETWORK_CLIENT_WAIT_TIME = 1;
+    const int NETWORK_CLIENT_CONNECT_TIMEOUT = 3000; // miliseconds
+    const int NETWORK_CLIENT_CHANNELS = 2;
 
 

code/trunk/src/network/ConnectionManager.h

@@ -61 +61 @@
 namespace network
 {
-#define NETWORK_PORT 55556
-#define NETWORK_MAX_CONNECTIONS 50
-#define NETWORK_WAIT_TIMEOUT 1
-#define NETWORK_DEFAULT_CHANNEL 0
+    const int NETWORK_PORT = 55556;
+    const int NETWORK_MAX_CONNECTIONS = 50;
+    const int NETWORK_WAIT_TIMEOUT = 1;
+    const int NETWORK_DEFAULT_CHANNEL = 0;
 
   struct ClientList{

code/trunk/src/network/GamestateManager.h

@@ -50 +50 @@
 {
 
-#define KEEP_GAMESTATES 10
+    const int KEEP_GAMESTATES = 10;
 
   /**

code/trunk/src/network/Server.cc

@@ -60 +60 @@
 namespace network
 {
-  #define MAX_FAILURES 20;
-  #define NETWORK_FREQUENCY 30
+  const int MAX_FAILURES = 20;
+  const int NETWORK_FREQUENCY = 30;
 
   /**

code/trunk/src/network/Server.h

@@ -51 +51 @@
 namespace network
 {
-  #define CLIENTID_SERVER 0
+  const int CLIENTID_SERVER = 0;
   
   /**