Changeset 9384 in orxonox.OLD for branches/proxy/src

Timestamp:

Jul 21, 2006, 12:51:53 PM (18 years ago)

Author:

patrick

Message:

oh my good! its working again, yehoo

Location:

branches/proxy/src/lib/network

Files:

• netdefs.h (modified) (1 diff)
• shared_network_data.cc (modified) (1 diff)
• shared_network_data.h (modified) (2 diffs)

branches/proxy/src/lib/network/netdefs.h

@@ -33 +33 @@
 
 
-//!< maximal connectinons for the server
-#define NET_MAX_CONNECTIONS 100
+
 
 //!< the amount of slots used before a proxy server is activated

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

@@ -37 +37 @@
   this->defaultSyncStream = NULL;
 
-  if( State::isOnline())
-    this->newUniqueID = ProxySettings::getInstance()->getMaxPlayer() + 2;
-  else
+//   if( State::isOnline())
+//     this->newUniqueID = ProxySettings::getInstance()->getMaxPlayer() + 2;
+//   else
     this->newUniqueID = NET_MAX_CONNECTIONS + 2;
   this->nodeType = NET_CLIENT;

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

@@ -11 +11 @@
 #include "proxy/proxy_settings.h"
 
+//!< maximal connectinons for the server
+#define NET_MAX_CONNECTIONS 100
 
 class NetworkStream;
@@ -38 +40 @@
 
     /** @returns the maximum number of players for this server */
-    inline int getMaxPlayer() { return ProxySettings::getInstance()->getMaxPlayer(); }
+    inline int getMaxPlayer() { return /*ProxySettings::getInstance()->getMaxPlayer()*/NET_MAX_CONNECTIONS; }
 
     /** @returns the hostID of the node */