Changeset 7730 for code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.h

Timestamp:

Dec 8, 2010, 3:05:07 PM (15 years ago)

Author:

smerkli

Message:

changes done, use —masterserver to launch master server

File:

• code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.h (modified) (1 diff)

code/branches/masterserver/src/orxonox/gamestates/GSMasterServer.h

@@ -35 +35 @@
 #include "core/GameState.h"
 #include "network/NetworkPrereqs.h"
+#include "network/MasterServer.h"
 
 namespace orxonox
 {
-    class _OrxonoxExport GSMasterServer : public GameState
-    {
+  class _OrxonoxExport GSMasterServer : public GameState
+  {
     public:
-        GSMasterServer(const GameStateInfo& info);
-        ~GSMasterServer();
+      GSMasterServer(const GameStateInfo& info);
+      ~GSMasterServer();
 
-        void activate();
-        void deactivate();
-        void update(const Clock& time);
+      void activate();
+      void deactivate();
+      void update(const Clock& time);
 
     private:
-        
-    };
+      MasterServer *mserver;
+
+
+  };
 }