Changeset 9656 in orxonox.OLD for trunk/src/lib/network/proxy

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

Location:

trunk/src/lib/network/proxy

Files:

• network_settings.cc (modified) (1 diff)
• proxy_control.cc (copied) (copied from branches/proxy/src/lib/network/proxy/proxy_control.cc)
• proxy_control.h (copied) (copied from branches/proxy/src/lib/network/proxy/proxy_control.h)

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

@@ -87 +87 @@
   // setUniqueID( maxCon+2 ) because we need one id for every handshake
   // and one for handshake to reject client maxCon+1
-  SharedNetworkData::getInstance()->setNewUniqueID( this->maxPlayer + 2);
+  // NEW: at most there will be
+  SharedNetworkData::getInstance()->setNewUniqueID( this->maxPlayer + NET_ID_PROXY_MAX + 2);
 }