Changeset 9374 in orxonox.OLD

Timestamp:

Jul 21, 2006, 1:12:57 AM (18 years ago)

Author:

patrick

Message:

other unique id offset

Location:

branches/proxy/src/lib/network

Files:

• network_stream.cc (modified) (3 diffs)
• shared_network_data.cc (modified) (2 diffs)

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

@@ -404 +404 @@
       it->second.socket = NULL;
 
+      // remove the old connectin monitor
       if ( it->second.connectionMonitor )
         delete it->second.connectionMonitor;
       it->second.connectionMonitor = NULL;
 
+      // remove the handshake
       if ( it->second.handshake )
         delete it->second.handshake;
       it->second.handshake = NULL;
 
+      // and cleanup the user infos
       for ( SynchronizeableList::iterator it2 = synchronizeables.begin(); it2 != synchronizeables.end(); it2++ )
       {
@@ -488 +491 @@
           if ( !it->second.handshake->allowDel() )
           {
+
             if ( this->pInfo->nodeType == NET_CLIENT )
             {
+
               SharedNetworkData::getInstance()->setHostID( it->second.handshake->getHostId() );
               this->pInfo->userId = SharedNetworkData::getInstance()->getHostID();
@@ -515 +520 @@
 
             PRINT(0)("handshake finished id=%d\n", it->second.handshake->getNetworkGameManagerId());
-
             it->second.handshake->del();
           }

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

@@ -18 +18 @@
 #include "shared_network_data.h"
 #include "netdefs.h"
+#include "state.h"
 
 
@@ -35 +36 @@
   this->hostID = -1;
   this->defaultSyncStream = NULL;
-  this->newUniqueID = NET_MAX_CONNECTIONS + 2;
+
+  if(State::isOnline())
+    this->newUniqueID = ProxySettings::getInstance()->getMaxPlayer() + 2;
+  else
+    this->newUniqueID = NET_MAX_CONNECTIONS + 2;
   this->nodeType = NET_CLIENT;
 }