Changeset 9398 in orxonox.OLD for branches/proxy/src/lib/network/proxy/network_settings.cc

Timestamp:

Jul 23, 2006, 11:43:27 PM (18 years ago)

Author:

patrick

Message:

new settings init

File:

• branches/proxy/src/lib/network/proxy/network_settings.cc (modified) (5 diffs)

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

@@ -17 +17 @@
 
 #include "network_settings.h"
+
 #include "netdefs.h"
+#include "shared_network_data.h"
 
 #include "loading/resource_manager.h"
@@ -38 +40 @@
   // suggest a good standard max players value
   this->maxPlayer = 10;
+
+  this->loadData();
 }
 
@@ -82 +86 @@
 
   this->loadNetworkSettings( root);
+
+  // set the new unique id offset
+  SharedNetworkData::getInstance()->setNewUniqueID( this->maxPlayer + 2);
 }
 
@@ -120 +127 @@
 }
 
+
 /**
  * sets the proxy address to
@@ -126 +134 @@
 void NetworkSettings::setProxyAddr(const std::string& proxyAddr)
 {
+
+  if( !SharedNetworkData::getInstance()->isMasterServer())
+    return;
+
   IPaddress *ip = new IPaddress;