Changeset 9396 in orxonox.OLD for branches/proxy/src/lib/network/shared_network_data.h

Timestamp:

Jul 23, 2006, 10:07:23 PM (18 years ago)

Author:

patrick

Message:

committing my weekends work: 2100 lines

• proxy server now accepts and synchronizes clients like a master server
• network manager got different network setup interface
• network stream got different constructure scheme
• permissions checking and algorithm extended and changed
• starting ability to connect to multiple network nodes at the same time
• some very much smaller changes here and there

File:

• branches/proxy/src/lib/network/shared_network_data.h (modified) (2 diffs)

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

@@ -9 +9 @@
 #include "base_object.h"
 #include "netdefs.h"
-#include "proxy/proxy_settings.h"
+#include "proxy/network_settings.h"
 
 //!< maximal connectinons for the server
@@ -40 +40 @@
 
     /** @returns the maximum number of players for this server */
-    inline int getMaxPlayer() { return ProxySettings::getInstance()->getMaxPlayer(); }
+    inline int getMaxPlayer() { return NetworkSettings::getInstance()->getMaxPlayer(); }
 
     /** @returns the hostID of the node */