1 files changed, 11 insertions, 22 deletions
diff --git a/StarsEx/StarServer.h b/StarsEx/StarServer.h
index 2164ce0..565f61d 100644
--- a/StarsEx/StarServer.h
+++ b/StarsEx/StarServer.h
@@ -10,31 +10,20 @@
 #ifndef StarServer_h
 #define StarServer_h
 
-#include "Types.h"
+#include "DataLoader.h"
 #include "Game.h"
-#include "Bitmap.h"
-#include "KeyMap.h"
-
-// +--------------------------------------------------------------------+
-
-class Universe;
-class Campaign;
-class Ship;
-class Sim;
-class FadeView;
-class CameraDirector;
-class MultiController;
-class MouseController;
-class DataLoader;
-
-class NetServer;
-class NetLobbyServer;
+#include "NetLobbyServer.h"
+#include "NetServer.h"
+#include "Mission.h"
+#include "Types.h"
+#include "Universe.h"
 
-// +--------------------------------------------------------------------+
 
 class StarServer : public Game
 {
 public:
+    static StarServer*   GetInstance();
+
     StarServer();
     virtual ~StarServer();
 
@@ -42,18 +31,17 @@ public:
     virtual bool      InitGame();
     virtual void      GameState();
 
-    bool      Server() override { return true; }
+    bool      Server() override;
     void      SetGameMode(int mode) override;
 
     void      CreateWorld();
 
-    static StarServer*   GetInstance()     { return instance; }
-
 protected:
     virtual void      UpdateWorld();
     virtual void      InstantiateMission();
 
     Universe*               world;
+    Mission*                current_mission;
 
     NetServer*              admin_server;
     NetLobbyServer*         lobby_server;
@@ -66,4 +54,5 @@ private:
     static StarServer* instance;
 };
 
+
 #endif  // StarServer_h