Changeset 7729 for code/branches/masterserver/src/libraries/network/MasterServer.h

Timestamp:

Dec 8, 2010, 2:33:54 PM (13 years ago)

Author:

smerkli

Message:

moved some files.

File:

• code/branches/masterserver/src/libraries/network/MasterServer.h (copied) (copied from code/branches/masterserver/src/libraries/network/masterserver/MasterServer.h) (4 diffs)

code/branches/masterserver/src/libraries/network/MasterServer.h

@@ -38 +38 @@
 #include <network/packet/Gamestate.h>
 #include <network/packet/Welcome.h>
-#include <util/Singleton.h>
 #include <network/MasterServerProtocol.h>
 
@@ -51 +50 @@
 {
   /* singleton */
-  class MasterServer: public Singleton<MasterServer>
+  class MasterServer
   {
     public:
@@ -57 +56 @@
       ~MasterServer();
 
-      friend class Singleton<MasterServer>;
-      static MasterServer& getInstance(void) 
-      { return Singleton<MasterServer>::getInstance(); }
-
-      /* data fields */
-      static MasterServer* singletonPtr_s;
-    
     private:
       /* methods */
@@ -79 +71 @@
       PeerList *peers;
 
+      unsigned int port;
+      bool quit;
+
       /* main routine */
       int run();
-
   };
 }