Changeset 9507 in orxonox.OLD for branches/proxy/src/lib/network/network_game_manager.cc

Timestamp:

Jul 27, 2006, 1:59:30 PM (18 years ago)

Author:

patrick

Message:

the player team change should now work on all clients in the network, its now a global synch variable

File:

• branches/proxy/src/lib/network/network_game_manager.cc (modified) (2 diffs)

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

@@ -272 +272 @@
 void NetworkGameManager::prefereTeam( int teamId )
 {
-  if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
-    setPreferedTeam( SharedNetworkData::getInstance()->getHostID(), teamId );
+  if ( SharedNetworkData::getInstance()->isMasterServer() )
+    this->setPreferedTeam( SharedNetworkData::getInstance()->getHostID(), teamId );
   else
   {
@@ -280 +280 @@
     assert( Converter::intToByteArray( teamId, buf, INTSIZE) == INTSIZE );
 
-    MessageManager::getInstance()->sendMessage( MSGID_PREFEREDTEAM, buf, INTSIZE, RT_USER, 0, MP_HIGHBANDWIDTH );
+    // send this message to the master server
+    MessageManager::getInstance()->sendMessage( MSGID_PREFEREDTEAM, buf, INTSIZE, RT_USER, NET_ID_MASTER_SERVER, MP_HIGHBANDWIDTH );
   }
 }