Changeset 9491 in orxonox.OLD for branches/proxy
- Timestamp:
- Jul 26, 2006, 2:43:26 PM (18 years ago)
- Location:
- branches/proxy/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/proxy/src/lib/network/message_manager.cc
r9406 r9491 320 320 if ( 321 321 recieverType == RT_ALL_ME || 322 recieverType == RT_ALL_ NOT_ME ||322 recieverType == RT_ALL_BUT_ME || 323 323 recieverType == RT_USER && it->first == reciever || 324 324 recieverType == RT_NOT_USER && it->first != reciever || 325 recieverType == RT_SERVER && getNetworkStream()->isUserMasterServer( it->first ) 325 recieverType == RT_SERVER && getNetworkStream()->isUserMasterServer( it->first ) || 326 recieverType == RT_SERVER && getNetworkStream()->isUserProxyServerActive( it->first ) 326 327 ) 327 328 { -
branches/proxy/src/lib/network/message_manager.h
r9454 r9491 40 40 enum RecieverType 41 41 { 42 RT_ALL_ NOT_ME = 1, //!< message is sent to all users42 RT_ALL_BUT_ME = 1, //!< message is sent to all users 43 43 RT_ALL_ME, //!< message is sent to all users 44 44 RT_USER, //!< message is only sent to reciever -
branches/proxy/src/lib/network/network_game_manager.cc
r9477 r9491 213 213 assert( Converter::intToByteArray( uniqueId, buf, INTSIZE ) == INTSIZE ); 214 214 215 MessageManager::getInstance()->sendMessage( MSGID_DELETESYNCHRONIZEABLE, buf, INTSIZE, RT_ALL_ NOT_ME, 0, MP_HIGHBANDWIDTH );215 MessageManager::getInstance()->sendMessage( MSGID_DELETESYNCHRONIZEABLE, buf, INTSIZE, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH ); 216 216 } 217 217 … … 307 307 if ( (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/) && userId != SharedNetworkData::getInstance()->getHostID() ) 308 308 { 309 MessageManager::getInstance()->sendMessage( messageId, data, dataLength, RT_ALL_ NOT_ME, 0, MP_HIGHBANDWIDTH );309 MessageManager::getInstance()->sendMessage( messageId, data, dataLength, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH ); 310 310 } 311 311 … … 350 350 MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_ME, 0, MP_HIGHBANDWIDTH ); 351 351 else 352 MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_ NOT_ME, 0, MP_HIGHBANDWIDTH );352 MessageManager::getInstance()->sendMessage( MSGID_CHATMESSAGE, buf, message.length()+3*INTSIZE, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH ); 353 353 354 354 -
branches/proxy/src/subprojects/network/network_unit_test.cc
r9462 r9491 276 276 for(;;) 277 277 { 278 MessageManager::getInstance()->sendMessage( TESTMESSAGEID, (byte*)"server to client", 18, RT_ALL_ NOT_ME, 0, MP_HIGHBANDWIDTH );278 MessageManager::getInstance()->sendMessage( TESTMESSAGEID, (byte*)"server to client", 18, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH ); 279 279 netMan->synchronize( 100 ); 280 280 SDL_Delay(100); … … 323 323 { 324 324 netMan->synchronize( 100 ); 325 MessageManager::getInstance()->sendMessage( TESTMESSAGEID, (byte*)"client to server", 18, RT_ALL_ NOT_ME, 0, MP_HIGHBANDWIDTH );325 MessageManager::getInstance()->sendMessage( TESTMESSAGEID, (byte*)"client to server", 18, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH ); 326 326 ss = dynamic_cast<SimpleSync*>(ClassList::getObject( "Server", CL_SIMPLE_SYNC ) ); 327 327 SDL_Delay(100); -
branches/proxy/src/world_entities/spawning_point.cc
r9466 r9491 213 213 assert( Converter::intToByteArray( uniqueId, buf + INTSIZE, INTSIZE ) == INTSIZE ); 214 214 215 MessageManager::getInstance()->sendMessage( MSGID_RESPAWN, buf, 2*INTSIZE, RT_ALL_ NOT_ME, 0, MP_HIGHBANDWIDTH );215 MessageManager::getInstance()->sendMessage( MSGID_RESPAWN, buf, 2*INTSIZE, RT_ALL_BUT_ME, 0, MP_HIGHBANDWIDTH ); 216 216 } 217 217
Note: See TracChangeset
for help on using the changeset viewer.