Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9384 in orxonox.OLD for branches


Ignore:
Timestamp:
Jul 21, 2006, 12:51:53 PM (18 years ago)
Author:
patrick
Message:

oh my good! its working again, yehoo

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

Legend:

Unmodified
Added
Removed

  • branches/proxy/src/lib/network/netdefs.h

    r9347 r9384  
    3333
    3434
    35 //!< maximal connectinons for the server
    36 #define NET_MAX_CONNECTIONS 100
     35
    3736
    3837//!< the amount of slots used before a proxy server is activated

  • branches/proxy/src/lib/network/shared_network_data.cc

    r9375 r9384  
    3737  this->defaultSyncStream = NULL;
    3838
    39   if( State::isOnline())
    40     this->newUniqueID = ProxySettings::getInstance()->getMaxPlayer() + 2;
    41   else
     39//   if( State::isOnline())
     40//     this->newUniqueID = ProxySettings::getInstance()->getMaxPlayer() + 2;
     41//   else
    4242    this->newUniqueID = NET_MAX_CONNECTIONS + 2;
    4343  this->nodeType = NET_CLIENT;

  • branches/proxy/src/lib/network/shared_network_data.h

    r9347 r9384  
    1111#include "proxy/proxy_settings.h"
    1212
     13//!< maximal connectinons for the server
     14#define NET_MAX_CONNECTIONS 100
    1315
    1416class NetworkStream;
    … …  
    3840
    3941    /** @returns the maximum number of players for this server */
    40     inline int getMaxPlayer() { return ProxySettings::getInstance()->getMaxPlayer(); }
     42    inline int getMaxPlayer() { return /*ProxySettings::getInstance()->getMaxPlayer()*/NET_MAX_CONNECTIONS; }
    4143
    4244    /** @returns the hostID of the node */
Note: See TracChangeset for help on using the changeset viewer.