Changeset 9545 in orxonox.OLD for branches/proxy/src/lib/network/network_stream.cc
- Timestamp:
- Jul 28, 2006, 11:12:32 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/lib/network/network_stream.cc
r9544 r9545 494 494 peers[userId].connectionMonitor = new ConnectionMonitor( userId ); 495 495 peers[userId].userId = userId; 496 PRINTF(0)("Setting client userId to%i\n", userId);497 496 498 497 PRINTF(0)("num sync: %d\n", synchronizeables.size()); … … 585 584 // - client <==> master server 586 585 // - proxy server <==> master server 587 if( SharedNetworkData::getInstance()->isClient() || SharedNetworkData::getInstance()->isProxyServerActive() && it->second.isMasterServer()) 586 if( SharedNetworkData::getInstance()->isClient() || 587 SharedNetworkData::getInstance()->isProxyServerActive() && 588 SharedNetworkData::getInstance()->isUserMasterServer(it->second.userId)) 588 589 { 589 590 PRINTF(0)("Handshake: i am in client role\n");
Note: See TracChangeset
for help on using the changeset viewer.