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

Timestamp:

Jul 27, 2006, 7:51:06 PM (18 years ago)

Author:

patrick

Message:

extended the callback function for message handlers to match the new sender/dest message structure

File:

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

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

@@ -166 +166 @@
  * @return true on successfull handling else handler will be called again
  */
-bool NetworkGameManager::delSynchronizeableHandler( MessageType messageType, byte * data, int dataLength, void * someData, int userId )
+bool NetworkGameManager::delSynchronizeableHandler( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  )
 {
 
@@ -172 +172 @@
 
   if ( SharedNetworkData::getInstance()->isMasterServer() ||
-       SharedNetworkData::getInstance()->isProxyServerActive() && SharedNetworkData::getInstance()->isUserClient(userId))
-  {
-    PRINTF(0)("Recieved DeleteSynchronizeable message from client %d!\n", userId);
+       SharedNetworkData::getInstance()->isProxyServerActive() && SharedNetworkData::getInstance()->isUserClient(senderId))
+  {
+    PRINTF(0)("Recieved DeleteSynchronizeable message from client %d!\n", senderId);
     return true;
   }
@@ -183 +183 @@
   if ( len != dataLength )
   {
-    PRINTF(2)("Recieved DeleteSynchronizeable message with incorrect size (%d) from client %d!\n", dataLength, userId);
+    PRINTF(2)("Recieved DeleteSynchronizeable message with incorrect size (%d) from client %d!\n", dataLength, senderId);
     return true;
   }
@@ -231 +231 @@
  * @return
  */
-bool NetworkGameManager::preferedTeamHandler( MessageType messageType, byte * data, int dataLength, void * someData, int userId )
+bool NetworkGameManager::preferedTeamHandler( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  )
 {
   assert( SharedNetworkData::getInstance()->isMasterServer() /*||  SharedNetworkData::getInstance()->isProxyServerActive()*/);
@@ -240 +240 @@
   if ( len != dataLength )
   {
-    PRINTF(2)("Recieved DeleteSynchronizeable message with incorrect size (%d) from client %d!\n", dataLength, userId);
+    PRINTF(2)("Recieved DeleteSynchronizeable message with incorrect size (%d) from client %d!\n", dataLength, senderId);
     return true;
   }
 
-  NetworkGameManager::getInstance()->setPreferedTeam( userId, teamId );
+  NetworkGameManager::getInstance()->setPreferedTeam( senderId, teamId );
 
   return true;
@@ -314 +314 @@
 
 
-bool NetworkGameManager::chatMessageHandler( MessageType messageType, byte * data, int dataLength, void * someData, int userId )
-{
-  PRINTF(0)("NetworkGameManager::chatMessageHandler %d %d\n", userId, SharedNetworkData::getInstance()->getHostID() );
-  if ( (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/) && userId !=  SharedNetworkData::getInstance()->getHostID() )
+bool NetworkGameManager::chatMessageHandler( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  )
+{
+  PRINTF(0)("NetworkGameManager::chatMessageHandler %d %d\n", senderId, SharedNetworkData::getInstance()->getHostID() );
+  if ( (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/) && senderId !=  SharedNetworkData::getInstance()->getHostID() )
   {
     MessageManager::getInstance()->sendMessage( messageType, data, dataLength, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH );
@@ -329 +329 @@
   if ( dataLength < 3*INTSIZE )
   {
-    PRINTF(2)("got too small chatmessage from client %d\n", userId);
+    PRINTF(2)("got too small chatmessage from client %d\n", senderId);
 
     return true;