Changeset 9555 in orxonox.OLD
- Timestamp:
- Jul 28, 2006, 12:09:56 PM (18 years ago)
- Location:
- branches/proxy/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/lib/network/message_manager.cc
r9542 r9555 253 253 { 254 254 255 PRINTF(0)("<<< MessageManager: got msg with type: %i, from sender %i, to rec: %i\n", messageType, senderId, destinationId); 255 256 // call the handler function and handle errors 256 257 if ( !(*(messageHandlerMap[(MessageType)messageType].cb))( (MessageType)messageType, data + i, messageLength, … … 271 272 incomingMessageQueue.push_back( msg ); 272 273 } 273 PRINTF(0)("<<< MessageManager: got msg with type: %i, from sender %i, to rec: %i\n", messageType, senderId, destinationId);274 274 } 275 275 // or else forward the message to the other servers -
branches/proxy/src/lib/network/proxy/proxy_control.cc
r9553 r9555 104 104 bool ProxyControl::messageHandlerNewClient( MessageType messageType, byte * data, int dataLength, void * someData, int senderId, int destinationId ) 105 105 { 106 int userId = 0;107 106 // body data length correct? 108 107 if ( dataLength != INTSIZE ) … … 112 111 } 113 112 // read the userId fromt he message body 114 assert( Converter::byteArrayToInt( data, &userId) == INTSIZE ); 113 int newClientId = 0; 114 assert( Converter::byteArrayToInt( data, &newClientId) == INTSIZE ); 115 115 116 PRINTF(0)("Got Signal: from %i new player arrived with userId: %i\n", senderId, userId);116 PRINTF(0)("Got Signal: from %i new player arrived with userId: %i\n", senderId, newClientId); 117 117 // part for the master server 118 118 if( SharedNetworkData::getInstance()->isMasterServer()) 119 119 { 120 120 // we now create the new player ship and stuff... 121 NetworkGameManager::getInstance()->signalNewPlayer( userId);121 NetworkGameManager::getInstance()->signalNewPlayer(newClientId); 122 122 } 123 123 else if(SharedNetworkData::getInstance()->isProxyServerActive()) -
branches/proxy/src/world_entities/spawning_point.cc
r9541 r9555 207 207 void SpawningPoint::sendRespawnMessage( int uniqueId ) 208 208 { 209 byte * buf = new byte[2*INTSIZE];209 byte buf[2*INTSIZE]; 210 210 211 211 assert( Converter::intToByteArray( this->getUniqueID(), buf, INTSIZE ) == INTSIZE );
Note: See TracChangeset
for help on using the changeset viewer.