Changeset 9282 in orxonox.OLD for branches/proxy/src/lib/network/network_stream.cc

Timestamp:

Jul 14, 2006, 12:06:30 AM (19 years ago)

Author:

patrick

Message:

another framework switch, and node registration work

File:

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

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

@@ -79 +79 @@
   this->peers[0].socket = new UdpSocket( host, port );
   this->peers[0].userId = 0;
-  this->peers[0].isMasterServer = true;
+  this->peers[0].nodeType = NET_MASTER_SERVER;
   this->peers[0].connectionMonitor = new ConnectionMonitor( 0 );
 }
@@ -306 +306 @@
       peers[clientId].handshake->setUniqueID(clientId);
       peers[clientId].userId = clientId;
-      peers[clientId].isMasterServer = false;
+      peers[clientId].nodeType = NET_CLIENT;
     }
     else
@@ -321 +321 @@
       peers[clientId].connectionMonitor = new ConnectionMonitor( clientId );
       peers[clientId].userId = clientId;
-      peers[clientId].isMasterServer = false;
+      peers[clientId].nodeType = NET_CLIENT;
 
       PRINTF(0)("num sync: %d\n", synchronizeables.size());
@@ -454 +454 @@
 //               PRINTF(0)("remote host is a %i\n", it->second.handshake->getRemoteNodeType());
               it->second.nodeType = it->second.handshake->getRemoteNodeType();
+              this->networkMonitor->addNode(&it->second);
 
               this->networkGameManager = NetworkGameManager::getInstance();
@@ -719 +720 @@
           }
 
-          if ( !peers[peer->second.userId].isMasterServer )
+          if ( !peers[peer->second.userId].isMasterServer() )
           {
             offset += syncDataLength;