Added base game mode management to Game

1 files changed, 10 insertions, 9 deletions

diff --git a/StarsEx/NetLobbyServer.cpp b/StarsEx/NetLobbyServer.cpp
index b3060c5..b3afc9f 100644
--- a/StarsEx/NetLobbyServer.cpp
+++ b/StarsEx/NetLobbyServer.cpp
@@ -43,6 +43,7 @@
 #include "Clock.h"
 #include "FormatUtil.h"
 #include "VersionInfo.h"
+#include "Game.h"
 
 // +-------------------------------------------------------------------+
 
@@ -99,7 +100,7 @@ NetLobbyServer::NetLobbyServer()
                         mission_id = (Campaign::MULTIPLAYER_MISSIONS << NET_CAMPAIGN_SHIFT) + m->id;
 
                         SelectMission(mission_id);
-                        star_server->SetGameMode(StarServer::LOAD_MODE);
+                        star_server->SetGameMode(Game::LOAD_MODE);
 
                         // lock in mission:
                         SetStatus(NetServerInfo::PERSISTENT);
@@ -273,7 +274,7 @@ NetLobbyServer::ExecFrame()
 
     // restart persistent mission?
     if (star_server &&
-            star_server->GetGameMode() == StarServer::MENU_MODE &&
+            star_server->GetGameMode() == Game::MENU_MODE &&
             server_mission.length() > 0) {
 
         NetCampaignInfo* c = campaigns.last();
@@ -306,8 +307,8 @@ NetLobbyServer::ExecFrame()
 
                         SelectMission(mission_id);
 
-                        if (star_server->GetGameMode() == StarServer::MENU_MODE) {
-                            star_server->SetGameMode(StarServer::LOAD_MODE);
+                        if (star_server->GetGameMode() == Game::MENU_MODE) {
+                            star_server->SetGameMode(Game::LOAD_MODE);
                         }
 
                         // lock in new mission:
@@ -408,12 +409,12 @@ NetLobbyServer::GameStart()
         SetStatus(NetServerInfo::BRIEFING);
 
         if (Starshatter::GetInstance()) {
-            Starshatter::GetInstance()->SetGameMode(Starshatter::PREP_MODE);
+            Starshatter::GetInstance()->SetGameMode(Game::PREP_MODE);
         }
         else {
             StarServer* s = StarServer::GetInstance();
-            if (s && s->GetGameMode() == StarServer::MENU_MODE) {
-                s->SetGameMode(StarServer::LOAD_MODE);
+            if (s && s->GetGameMode() == Game::MENU_MODE) {
+                s->SetGameMode(Game::LOAD_MODE);
             }
         }
     }
@@ -426,8 +427,8 @@ NetLobbyServer::GameStop()
         SetStatus(NetServerInfo::LOBBY);
 
         StarServer* s = StarServer::GetInstance();
-        if (s && s->GetGameMode() != StarServer::MENU_MODE) {
-            s->SetGameMode(StarServer::MENU_MODE);
+        if (s && s->GetGameMode() != Game::MENU_MODE) {
+            s->SetGameMode(Game::MENU_MODE);
         }
     }
 }