Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9474 in orxonox.OLD for branches/proxy


Ignore:
Timestamp:
Jul 25, 2006, 11:09:28 PM (18 years ago)
Author:
patrick
Message:

the hybrid mode should work now in a very closed setup

Location:
branches/proxy/src/lib/network
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/proxy/src/lib/network/README.NETWORK

    r9459 r9474  
    5454=====================================
    5555The network node with the offset 0 is always the server to which the client must connect to (in case there are connections to other hosts at the same time).
     56
     57
     58
     59
     60UNSOLVED:
     61=========
     62 - what if the proxy server gets a new client and wants to add it to the game? There are some problems waiting in the network game manager
     63 - actualy the whole message sending system won't work in this network topic. proxys have to relay messages to clients
     64
     65
     66
  • branches/proxy/src/lib/network/network_stream.cc

    r9473 r9474  
    825825    // now compress the data with the zip library
    826826    int compLength = 0;
    827     if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/)
     827    if ( SharedNetworkData::getInstance()->isMasterServer() ||
     828         SharedNetworkData::getInstance()->isProxyServerActive())
    828829      compLength = Zip::getInstance()->zip( buf, offset, compBuf, UDP_PACKET_SIZE, dictServer );
    829830    else
  • branches/proxy/src/lib/network/player_stats.cc

    r9466 r9474  
    191191void PlayerStats::setNickName( std::string nick )
    192192{
    193   if ( SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/ )
     193  if ( SharedNetworkData::getInstance()->isMasterServer())
    194194  {
    195195    this->nickName = nick;
  • branches/proxy/src/lib/network/synchronizeable.cc

    r9469 r9474  
    7272    this->networkStream->disconnectSynchronizeable(*this);
    7373
    74     if ( (SharedNetworkData::getInstance()->isMasterServer() /*|| SharedNetworkData::getInstance()->isProxyServerActive()*/ )
     74    // remove the message manager only by the server
     75    if ( (SharedNetworkData::getInstance()->isMasterServer() )
    7576           && this->beSynchronized() && this->getUniqueID() > 0 && !this->isA( CL_MESSAGE_MANAGER ) )
    7677      NetworkGameManager::getInstance()->removeSynchronizeable( this->getUniqueID() );
Note: See TracChangeset for help on using the changeset viewer.