Changeset 9541 in orxonox.OLD for branches/proxy/src/lib/network/proxy

Timestamp:

Jul 28, 2006, 10:33:34 AM (18 years ago)

Author:

patrick

Message:

discovered a bug in the client id assignement algorithm. corrected. proxy control center should work now. testing

File:

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

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

@@ -21 +21 @@
 #include "state.h"
 #include "shared_network_data.h"
+#include "network_game_manager.h"
 
 #include "converter.h"
@@ -103 +104 @@
 bool ProxyControl::messageHandlerNewClient( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId  )
 {
-  PRINTF(0)("Got Signal: new player arrived\n");
+  int userId;
+  // body data length correct?
+  if ( dataLength != INTSIZE )
+  {
+    PRINTF(2)("new client message has wrong size: %d\n", dataLength );
+    return true;
+  }
+  // read the userId fromt he message body
+  assert( Converter::byteArrayToInt( data, &userId) == INTSIZE );
+
+  PRINTF(0)("Got Signal: new player arrived with userId: %i\n", userId);
   // part for the master server
   if( SharedNetworkData::getInstance()->isMasterServer())
   {
-
+    // we now create the new player ship and stuff...
+    NetworkGameManager::getInstance()->signalNewPlayer(userId);
   }
   else if(SharedNetworkData::getInstance()->isProxyServerActive())