Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 16, 2011, 2:55:40 PM (12 years ago)
Author:
smerkli
Message:

merged masterserverfix corretly now.

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/src/libraries/network/MasterServer.h

    r8351 r8937  
    6161      int run();
    6262
     63      /* static pointer for commands */
     64      static MasterServer *instance;
     65      static MasterServer *getInstance()
     66        { return instance; }
     67      static void setInstance( MasterServer *setto )
     68        { instance = setto;  }
     69     
     70      /* functions for commands */
     71      static void listServers( void );
     72      static void delServer( std::string todeladdr );
     73
    6374    private:
    6475      /* methods */
     
    6980      /* helpers */
    7081      void helper_sendlist( ENetEvent *event );
     82      void helper_cleanupServers( void );
    7183
    7284      /* members */
     
    7486      ENetHost *server;
    7587      ServerList mainlist;
    76       PeerList *peers;
    7788
    7889      unsigned int port;
Note: See TracChangeset for help on using the changeset viewer.