Merge pull request #1652 from OutpostUniverse/Move-FileIO-to-GameState

Move file io to game state

Author: DanRStevens

appOPHD/States/GameState.cpp

@@ -20,15 +20,15 @@ NAS2D::Point<int> MOUSE_COORDS; /**< Mouse Coordinates. Used by other states/wra
 
 GameState::GameState(const std::string& savedGameFilename) :
 	mMainReportsState{std::make_unique<MainReportsUiState>()},
-	mMapViewState{std::make_unique<MapViewState>(*mMainReportsState.get(), savedGameFilename)}
+	mMapViewState{std::make_unique<MapViewState>(*this, savedGameFilename)}
 {
 	initializeGameState();
 }
 
 
 GameState::GameState(const Planet::Attributes& planetAttributes, Difficulty selectedDifficulty) :
 	mMainReportsState{std::make_unique<MainReportsUiState>()},
-	mMapViewState{std::make_unique<MapViewState>(*mMainReportsState.get(), planetAttributes, selectedDifficulty)}
+	mMapViewState{std::make_unique<MapViewState>(*this, planetAttributes, selectedDifficulty)}
 {
 	initializeGameState();
 }
@@ -48,6 +48,7 @@ GameState::~GameState()
 
 void GameState::initializeGameState()
 {
+	mFileIoDialog.fileLoadSignal().connect({this, &GameState::onLoadGame});
 	mMainReportsState->initialize();
 	mMainReportsState->hideReports().connect({this, &GameState::onHideReports});
 
@@ -74,7 +75,6 @@ void GameState::initializeMapViewState()
 	mMapViewState->quit().connect({this, &GameState::onQuit});
 	mMapViewState->showReportsUi().connect({this, &GameState::onShowReports});
 	mMapViewState->mapChanged().connect({this, &GameState::onMapChange});
-	mMapViewState->fileLoadSignal().connect({this, &GameState::onLoadGame});
 }
 
 
@@ -164,7 +164,7 @@ void GameState::onLoadGame(const std::string& saveGameName)
 		{
 			throw std::runtime_error("Save game file does not exist: " + saveGamePath);
 		}
-		auto newMapViewState = std::make_unique<MapViewState>(*mMainReportsState.get(), saveGamePath);
+		auto newMapViewState = std::make_unique<MapViewState>(*this, saveGamePath);
 		newMapViewState->initialize();
 		mNewMapViewState = std::move(newMapViewState);
 	}

appOPHD/States/GameState.h

@@ -29,6 +29,9 @@ class GameState : public NAS2D::State
 
 	State* update() override;
 
+	MainReportsUiState& mainReportsState() { return *mMainReportsState; }
+	FileIo& fileIoDialog() { return mFileIoDialog; }
+
 protected:
 	void initializeGameState();
 	void initializeMapViewState();
@@ -54,4 +57,5 @@ class GameState : public NAS2D::State
 	Wrapper* mActiveState = nullptr;
 	NAS2D::State* mReturnState = this;
 	NAS2D::Fade mFade;
+	FileIo mFileIoDialog;
 };

appOPHD/States/MapViewState.cpp

@@ -4,6 +4,7 @@
 
 #include "MainMenuState.h"
 #include "MainReportsUiState.h"
+#include "GameState.h"
 #include "Route.h"
 
 #include "../Constants/Strings.h"
@@ -178,16 +179,17 @@ const std::map<Difficulty, int> MapViewState::ColonyShipDeorbitMoraleLossMultipl
 };
 
 
-MapViewState::MapViewState(MainReportsUiState& mainReportsState, const std::string& savegame) :
+MapViewState::MapViewState(GameState& gameState, const std::string& savegame) :
 	mCrimeRateUpdate{mDifficulty},
 	mCrimeExecution{mDifficulty, {this, &MapViewState::onCrimeEvent}},
 	mTechnologyReader{"tech0-1.xml"},
 	mLoadingExisting{true},
 	mExistingToLoad{savegame},
-	mMainReportsState{mainReportsState},
+	mMainReportsState{gameState.mainReportsState()},
 	mStructures{"ui/structures.png", constants::StructureIconSize, constants::MarginTight},
 	mRobots{"ui/robots.png", constants::RobotIconSize, constants::MarginTight},
 	mConnections{"ui/structures.png", constants::StructureIconSize, constants::MarginTight},
+	mFileIoDialog{gameState.fileIoDialog()},
 	mPopulationPanel{mPopulation, mPopulationPool, mMorale},
 	mResourceInfoBar{mResourcesCount, mPopulation, mMorale, mFood},
 	mRobotDeploymentSummary{mRobotPool}
@@ -197,18 +199,19 @@ MapViewState::MapViewState(MainReportsUiState& mainReportsState, const std::stri
 }
 
 
-MapViewState::MapViewState(MainReportsUiState& mainReportsState, const Planet::Attributes& planetAttributes, Difficulty selectedDifficulty) :
+MapViewState::MapViewState(GameState& gameState, const Planet::Attributes& planetAttributes, Difficulty selectedDifficulty) :
 	mDifficulty{selectedDifficulty},
 	mTileMap{std::make_unique<TileMap>(planetAttributes.mapImagePath, planetAttributes.maxDepth, planetAttributes.maxMines, HostilityMineYields.at(planetAttributes.hostility))},
 	mCrimeRateUpdate{mDifficulty},
 	mCrimeExecution{mDifficulty, {this, &MapViewState::onCrimeEvent}},
 	mTechnologyReader{"tech0-1.xml"},
 	mPlanetAttributes{planetAttributes},
-	mMainReportsState{mainReportsState},
+	mMainReportsState{gameState.mainReportsState()},
 	mMapView{std::make_unique<MapView>(*mTileMap)},
 	mStructures{"ui/structures.png", constants::StructureIconSize, constants::MarginTight},
 	mRobots{"ui/robots.png", constants::RobotIconSize, constants::MarginTight},
 	mConnections{"ui/structures.png", constants::StructureIconSize, constants::MarginTight},
+	mFileIoDialog{gameState.fileIoDialog()},
 	mPopulationPanel{mPopulation, mPopulationPool, mMorale},
 	mPoliceOverlays{static_cast<std::vector<Tile*>::size_type>(mTileMap->maxDepth() + 1)},
 	mResourceInfoBar{mResourcesCount, mPopulation, mMorale, mFood},
@@ -241,6 +244,7 @@ MapViewState::~MapViewState()
 	eventHandler.windowResized().disconnect({this, &MapViewState::onWindowResized});
 
 	NAS2D::Utility<std::map<class MineFacility*, Route>>::get().clear();
+	mFileIoDialog.fileSaveSignal().disconnect({this, &MapViewState::onSaveGame});
 }
 
 

appOPHD/States/MapViewState.h

@@ -19,7 +19,6 @@
 #include "../UI/NotificationWindow.h"
 #include "../UI/DiggerDirection.h"
 #include "../UI/FactoryProduction.h"
-#include "../UI/FileIo.h"
 #include "../UI/GameOverDialog.h"
 #include "../UI/GameOptionsDialog.h"
 #include "../UI/IconGrid.h"
@@ -79,6 +78,8 @@ class MapView;
 class DetailMap;
 class NavControl;
 class MainReportsUiState;
+class GameState;
+class FileIo;
 
 
 enum class InsertMode
@@ -105,19 +106,17 @@ class MapViewState : public Wrapper
 	using QuitSignal = NAS2D::Signal<>;
 	using ReportsUiSignal = NAS2D::Signal<>;
 	using MapChangedSignal = NAS2D::Signal<>;
-	using FileLoadSignal = NAS2D::Signal<const std::string&>;
 
 public:
-	MapViewState(MainReportsUiState&, const std::string& savegame);
-	MapViewState(MainReportsUiState&, const Planet::Attributes& planetAttributes, Difficulty selectedDifficulty);
+	MapViewState(GameState& gameState, const std::string& savegame);
+	MapViewState(GameState& gameState, const Planet::Attributes& planetAttributes, Difficulty selectedDifficulty);
 	~MapViewState() override;
 
 	void setPopulationLevel(PopulationLevel popLevel);
 
 	ReportsUiSignal::Source& showReportsUi() { return mReportsUiSignal; }
 	QuitSignal::Source& quit() { return mQuitSignal; }
 	MapChangedSignal::Source& mapChanged() { return mMapChangedSignal; }
-	FileLoadSignal::Source& fileLoadSignal() { return mFileIoDialog.fileLoadSignal(); }
 
 	void focusOnStructure(const Structure* s);
 
@@ -368,7 +367,7 @@ class MapViewState : public Wrapper
 	CheatMenu mCheatMenu;
 	DiggerDirection mDiggerDirection;
 	FactoryProduction mFactoryProduction;
-	FileIo mFileIoDialog;
+	FileIo& mFileIoDialog;
 	GameOverDialog mGameOverDialog;
 	GameOptionsDialog mGameOptionsDialog;
 	MajorEventAnnouncement mAnnouncement;