Changeset 9477 in orxonox.OLD

Timestamp:

Jul 25, 2006, 11:37:41 PM (18 years ago)

Author:

patrick

Message:

now the proxy is in client mode again for testing

Location:

branches/proxy/src/lib/network

Files:

• network_game_manager.cc (modified) (3 diffs)
• network_manager.cc (modified) (2 diffs)

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

@@ -261 +261 @@
 void NetworkGameManager::prefereTeam( int teamId )
 {
-  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
     setPreferedTeam( SharedNetworkData::getInstance()->getHostID(), teamId );
   else
@@ -305 +305 @@
 {
   PRINTF(0)("NetworkGameManager::chatMessageHandler %d %d\n", userId, SharedNetworkData::getInstance()->getHostID() );
-  if ( (SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive()) && userId !=  SharedNetworkData::getInstance()->getHostID() )
+  if ( (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/) && userId !=  SharedNetworkData::getInstance()->getHostID() )
   {
     MessageManager::getInstance()->sendMessage( messageId, data, dataLength, RT_ALL_NOT_ME, 0, MP_HIGHBANDWIDTH );
@@ -347 +347 @@
   assert( Converter::stringToByteArray(message, buf+2*INTSIZE, message.length()+INTSIZE) == message.length()+INTSIZE );
 
-  if ( SharedNetworkData::getInstance()->isMasterServer() || SharedNetworkData::getInstance()->isProxyServerActive())
+  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
     MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_ME, 0, MP_HIGHBANDWIDTH );
   else

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

@@ -133 +133 @@
   this->networkStream = new NetworkStream(NET_PROXY_SERVER_ACTIVE );
   // first connect to the master server for synchronization
-//   this->networkStream->connectToMasterServer(NetworkSettings::getInstance()->getMasterAddr().ipString(), 10000);
+  this->networkStream->connectToMasterServer(NetworkSettings::getInstance()->getMasterAddr().ipString(), 10000);
   // start the handshake with the master server
-//   this->networkStream->startHandshake(NET_ID_MASTER_SERVER);
+  this->networkStream->startHandshake(NET_ID_MASTER_SERVER);
 
 
   // then start the server
-  this->networkStream->createServer( port, port +1);
+//   this->networkStream->createServer( port, port +1);
 
 
@@ -146 +146 @@
 
   // start the network game manager
-   this->networkStream->createNetworkGameManager();
+//    this->networkStream->createNetworkGameManager();