- added ability to remember last custom game settings

source/glest_game/facilities/components.cpp

@@ -17,10 +17,11 @@
 #include "metrics.h"
 #include "core_data.h"
 #include "platform_util.h"
-
+#include "util.h"
 #include "leak_dumper.h"
 
 using namespace std;
+using namespace Shared::Util;
 
 namespace Glest{ namespace Game{
 
@@ -150,6 +151,9 @@ void GraphicListBox::setSelectedItem(string item, bool errorOnMissing){
 
 	if(iter==items.end()) {
 		if(errorOnMissing == true) {
+			for(int idx = 0; idx < items.size(); idx++) {
+				SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] idx = %d items[idx] = [%s]\n",__FILE__,__FUNCTION__,__LINE__,idx,items[idx].c_str());
+			}
 			throw runtime_error("Value not found on list box: "+item);
 		}
 	}

source/glest_game/game/game_settings.h

@@ -88,8 +88,8 @@ public:
 	void setScenarioDir(const string& scenarioDir)						{this->scenarioDir= scenarioDir;}
 
 	void setFactionTypeName(int factionIndex, const string& factionTypeName)	{this->factionTypeNames[factionIndex]= factionTypeName;}
-	void setNetworkPlayerName(int factionIndex,const string& playername)     {this->networkPlayerNames[factionIndex]= playername;}
+	void setNetworkPlayerName(int factionIndex,const string& playername)    {this->networkPlayerNames[factionIndex]= playername;}
-	void setFactionControl(int factionIndex, ControlType controller)			{this->factionControls[factionIndex]= controller;}
+	void setFactionControl(int factionIndex, ControlType controller)		{this->factionControls[factionIndex]= controller;}
 	void setThisFactionIndex(int thisFactionIndex) 							{this->thisFactionIndex= thisFactionIndex;}
 	void setFactionCount(int factionCount)									{this->factionCount= factionCount;}
 	void setTeam(int factionIndex, int team)								{this->teams[factionIndex]= team;}

source/glest_game/menu/menu_state_custom_game.cpp

@@ -231,9 +231,11 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
 	updateControlers();
 	updateNetworkSlots();
 
-	// Esnure we have set the gamesettings at least once
+	// Ensure we have set the gamesettings at least once
-	GameSettings gameSettings;
+	GameSettings gameSettings = loadGameSettingsFromFile("lastCustomGamSettings.mgg");
-	loadGameSettings(&gameSettings);
+	if(gameSettings.getMap() == "") {
+		loadGameSettings(&gameSettings);
+	}
 
 	ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface();
 	serverInterface->setGameSettings(&gameSettings,true);
@@ -339,6 +341,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
 			}
 			needToBroadcastServerSettings = false;
 			needToRepublishToMasterserver = false;
+
 			BaseThread::shutdownAndWait(publishToMasterserverThread);
             program->setState(new Game(program, &gameSettings));
 		}
@@ -462,6 +465,9 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
 			}
 		}
 	}
+
+	saveGameSettingsToFile("lastCustomGamSettings.mgg");
+
 	SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
 }
 
@@ -864,8 +870,7 @@ void MenuStateCustomGame::simpleTask() {
 	}
 }
 
-void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings)
+void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings) {
-{
     SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
 
 	int factionCount= 0;
@@ -926,6 +931,147 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings)
 	SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
 }
 
+void MenuStateCustomGame::saveGameSettingsToFile(std::string fileName) {
+    SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
+
+    if(getGameReadWritePath() != "") {
+    	fileName = getGameReadWritePath() + fileName;
+    }
+
+    SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] fileName = [%s]\n",__FILE__,__FUNCTION__,__LINE__,fileName.c_str());
+
+	GameSettings gameSettings;
+	loadGameSettings(&gameSettings);
+
+    std::ofstream saveGameFile;
+    saveGameFile.open(fileName.c_str(), ios_base::out | ios_base::trunc);
+
+	//int factionCount= 0;
+	//ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface();
+
+	saveGameFile << "Description=" << gameSettings.getDescription() << std::endl;
+
+	saveGameFile << "Map=" << gameSettings.getMap() << std::endl;
+	saveGameFile << "Tileset=" << gameSettings.getTileset() << std::endl;
+	saveGameFile << "TechTree=" << gameSettings.getTech() << std::endl;
+	saveGameFile << "DefaultUnits=" << gameSettings.getDefaultUnits() << std::endl;
+	saveGameFile << "DefaultResources=" << gameSettings.getDefaultResources() << std::endl;
+	saveGameFile << "DefaultVictoryConditions=" << gameSettings.getDefaultVictoryConditions() << std::endl;
+	saveGameFile << "FogOfWar=" << gameSettings.getFogOfWar() << std::endl;
+	saveGameFile << "EnableObserverModeAtEndGame=" << gameSettings.getEnableObserverModeAtEndGame() << std::endl;
+
+	saveGameFile << "FactionThisFactionIndex=" << gameSettings.getThisFactionIndex() << std::endl;
+	saveGameFile << "FactionCount=" << gameSettings.getFactionCount() << std::endl;
+
+    for(int i = 0; i < gameSettings.getFactionCount(); ++i) {
+		saveGameFile << "FactionControlForIndex" << i << "=" << gameSettings.getFactionControl(i) << std::endl;
+		saveGameFile << "FactionTeamForIndex" << i << "=" << gameSettings.getTeam(i) << std::endl;
+		saveGameFile << "FactionStartLocationForIndex" << i << "=" << gameSettings.getStartLocationIndex(i) << std::endl;
+		saveGameFile << "FactionTypeNameForIndex" << i << "=" << gameSettings.getFactionTypeName(i) << std::endl;
+		saveGameFile << "FactionPlayerNameForIndex" << i << "=" << gameSettings.getNetworkPlayerName(i) << std::endl;
+    }
+
+	SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
+}
+
+GameSettings MenuStateCustomGame::loadGameSettingsFromFile(std::string fileName) {
+    SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
+
+    GameSettings gameSettings;
+
+    if(getGameReadWritePath() != "") {
+    	fileName = getGameReadWritePath() + fileName;
+    }
+
+    SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] fileName = [%s]\n",__FILE__,__FUNCTION__,__LINE__,fileName.c_str());
+
+    if(fileExists(fileName) == false) {
+    	return gameSettings;
+    }
+
+    try {
+		Properties properties;
+		SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] fileName = [%s]\n",__FILE__,__FUNCTION__,__LINE__,fileName.c_str());
+		properties.load(fileName);
+		SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] fileName = [%s]\n",__FILE__,__FUNCTION__,__LINE__,fileName.c_str());
+
+		gameSettings.setDescription(properties.getString("Description"));
+		gameSettings.setMap(properties.getString("Map"));
+		gameSettings.setTileset(properties.getString("Tileset"));
+		gameSettings.setTech(properties.getString("TechTree"));
+		gameSettings.setDefaultUnits(properties.getBool("DefaultUnits"));
+		gameSettings.setDefaultResources(properties.getBool("DefaultResources"));
+		gameSettings.setDefaultVictoryConditions(properties.getBool("DefaultVictoryConditions"));
+		gameSettings.setFogOfWar(properties.getBool("FogOfWar"));
+		gameSettings.setEnableObserverModeAtEndGame(properties.getBool("EnableObserverModeAtEndGame"));
+
+		gameSettings.setThisFactionIndex(properties.getInt("FactionThisFactionIndex"));
+		gameSettings.setFactionCount(properties.getInt("FactionCount"));
+
+		for(int i = 0; i < gameSettings.getFactionCount(); ++i) {
+			gameSettings.setFactionControl(i,(ControlType)properties.getInt(string("FactionControlForIndex") + intToStr(i)) );
+			gameSettings.setTeam(i,properties.getInt(string("FactionTeamForIndex") + intToStr(i)) );
+			gameSettings.setStartLocationIndex(i,properties.getInt(string("FactionStartLocationForIndex") + intToStr(i)) );
+			gameSettings.setFactionTypeName(i,properties.getString(string("FactionTypeNameForIndex") + intToStr(i)) );
+			gameSettings.setNetworkPlayerName(i,properties.getString(string("FactionPlayerNameForIndex") + intToStr(i)) );
+		}
+
+		SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
+
+		Lang &lang= Lang::getInstance();
+
+		string mapFile = gameSettings.getMap();
+		mapFile = formatString(mapFile);
+		listBoxMap.setSelectedItem(mapFile);
+
+		string tilesetFile = gameSettings.getTileset();
+		tilesetFile = formatString(tilesetFile);
+
+		listBoxTileset.setSelectedItem(tilesetFile);
+
+		string techtreeFile = gameSettings.getTech();
+		techtreeFile = formatString(techtreeFile);
+
+		listBoxTechTree.setSelectedItem(techtreeFile);
+
+		SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
+
+		//gameSettings->setDefaultUnits(true);
+		//gameSettings->setDefaultResources(true);
+		//gameSettings->setDefaultVictoryConditions(true);
+
+		listBoxFogOfWar.setSelectedItem(gameSettings.getFogOfWar() == true ? lang.get("Yes") : lang.get("No"));
+		listBoxEnableObserverMode.setSelectedItem(gameSettings.getEnableObserverModeAtEndGame() == true ? lang.get("Yes") : lang.get("No"));
+
+		SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
+
+		reloadFactions();
+
+		SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d] gameSettings.getFactionCount() = %d\n",__FILE__,__FUNCTION__,__LINE__,gameSettings.getFactionCount());
+
+		for(int i = 0; i < gameSettings.getFactionCount(); ++i) {
+			listBoxControls[i].setSelectedItemIndex(gameSettings.getFactionControl(i));
+			listBoxTeams[i].setSelectedItemIndex(gameSettings.getTeam(i));
+
+			string factionName = gameSettings.getFactionTypeName(i);
+			factionName = formatString(factionName);
+
+			SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] factionName = [%s]\n",__FILE__,__FUNCTION__,__LINE__,factionName.c_str());
+
+			listBoxFactions[i].setSelectedItem(factionName);
+		}
+		//!!!
+    }
+    catch(const exception &ex) {
+    	SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] ERROR = [%s]\n",__FILE__,__FUNCTION__,__LINE__,ex.what());
+    	showMessageBox( ex.what(), "Error", false);
+
+    	gameSettings = GameSettings();
+    }
+
+	SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
+}
+
 // ============ PRIVATE ===========================
 
 bool MenuStateCustomGame::hasNetworkGameSettings()
@@ -1118,5 +1264,4 @@ void MenuStateCustomGame::showMessageBox(const string &text, const string &heade
 	}
 }
 
-
 }}//end namespace

source/glest_game/menu/menu_state_custom_game.h

@@ -100,6 +100,9 @@ private:
 	void publishToMasterserver();
 	void returnToParentMenu();
 	void showMessageBox(const string &text, const string &header, bool toggle);
+
+	void saveGameSettingsToFile(std::string fileName);
+	GameSettings loadGameSettingsFromFile(std::string fileName);
 };
 
 }}//end namespace