Move the gamemaster screen code into its own directory, so we can sta…

…rt splitting up that code and improve it.
daid · Apr 4, 2016 · 60fe45e · 60fe45e
1 parent 5d798f3
commit 60fe45e
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,7 +61,6 @@ set(SOURCES
 	src/menus/autoConnectScreen.cpp
 	src/screens/crewStationScreen.cpp
 	src/screens/topDownScreen.cpp
-	src/screens/gameMasterScreen.cpp
 	src/screens/windowScreen.cpp
 	src/screens/mainScreen.cpp
 	src/screens/crew4/operationsScreen.cpp
@@ -77,6 +76,7 @@ set(SOURCES
 	src/screens/extra/powerManagement.cpp
 	src/screens/extra/databaseScreen.cpp
 	src/screens/extra/shipLogScreen.cpp
+	src/screens/gm/gameMasterScreen.cpp
 	src/screenComponents/missileTubeControls.cpp
 	src/screenComponents/selfDestructIndicator.cpp
 	src/screenComponents/viewport3d.cpp

diff --git a/EmptyEpsilon.cbp b/EmptyEpsilon.cbp
@@ -677,8 +677,8 @@
 		<Unit filename="src/screens/extra/powerManagement.h" />
 		<Unit filename="src/screens/extra/shipLogScreen.cpp" />
 		<Unit filename="src/screens/extra/shipLogScreen.h" />
-		<Unit filename="src/screens/gameMasterScreen.cpp" />
-		<Unit filename="src/screens/gameMasterScreen.h" />
+		<Unit filename="src/screens/gm/gameMasterScreen.cpp" />
+		<Unit filename="src/screens/gm/gameMasterScreen.h" />
 		<Unit filename="src/screens/mainScreen.cpp" />
 		<Unit filename="src/screens/mainScreen.h" />
 		<Unit filename="src/screens/topDownScreen.cpp" />

diff --git a/src/menus/mainMenus.cpp b/src/menus/mainMenus.cpp
@@ -11,7 +11,7 @@
 #include "menus/serverCreationScreen.h"
 #include "menus/optionsMenu.h"
 #include "menus/serverBrowseMenu.h"
-#include "screens/gameMasterScreen.h"
+#include "screens/gm/gameMasterScreen.h"
 
 MainMenu::MainMenu()
 {

diff --git a/src/menus/shipSelectionScreen.cpp b/src/menus/shipSelectionScreen.cpp
@@ -5,7 +5,7 @@
 #include "gameGlobalInfo.h"
 #include "screens/windowScreen.h"
 #include "screens/topDownScreen.h"
-#include "screens/gameMasterScreen.h"
+#include "screens/gm/gameMasterScreen.h"
 
 ShipSelectionScreen::ShipSelectionScreen()
 {

diff --git a/src/screens/gameMasterScreen.cpp → src/screens/gm/gameMasterScreen.cpp b/src/screens/gameMasterScreen.cpp → src/screens/gm/gameMasterScreen.cpp
diff --git a/src/screens/gameMasterScreen.h → src/screens/gm/gameMasterScreen.h b/src/screens/gameMasterScreen.h → src/screens/gm/gameMasterScreen.h