mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-01 04:01:47 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix for saving of lastgame settings

Browse Source
This commit is contained in:
Mark Vejvoda
2010-05-31 20:49:23 +00:00
parent f4750e6f8b
commit 69f65992e1
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/glest_game/menu/menu_state_custom_game.cpp
View File

@@ -238,7 +238,7 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu, b
} }
ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface(); ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface();
serverInterface->setGameSettings(&gameSettings,true); serverInterface->setGameSettings(&gameSettings,false);
//chatManager.init(&console, world.getThisTeamIndex()); //chatManager.init(&console, world.getThisTeamIndex());
chatManager.init(&console, -1); chatManager.init(&console, -1);
@@ -286,6 +286,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
mainMessageBox.setEnabled(false); mainMessageBox.setEnabled(false);
} }
} }
saveGameSettingsToFile("lastCustomGamSettings.mgg");
} }
else if(buttonReturn.mouseClick(x,y)){ else if(buttonReturn.mouseClick(x,y)){
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
@@ -301,6 +302,8 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
simpleTask(); simpleTask();
} }
*/ */
saveGameSettingsToFile("lastCustomGamSettings.mgg");
returnToParentMenu(); returnToParentMenu();
} }
else if(buttonPlayNow.mouseClick(x,y) && buttonPlayNow.getEnabled()) { else if(buttonPlayNow.mouseClick(x,y) && buttonPlayNow.getEnabled()) {
@@ -342,6 +345,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
needToBroadcastServerSettings = false; needToBroadcastServerSettings = false;
needToRepublishToMasterserver = false; needToRepublishToMasterserver = false;
saveGameSettingsToFile("lastCustomGamSettings.mgg");
BaseThread::shutdownAndWait(publishToMasterserverThread); BaseThread::shutdownAndWait(publishToMasterserverThread);
program->setState(new Game(program, &gameSettings)); program->setState(new Game(program, &gameSettings));
} }
@@ -361,6 +365,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
needToSetChangedGameSettings = true; needToSetChangedGameSettings = true;
lastSetChangedGameSettings = time(NULL); lastSetChangedGameSettings = time(NULL);
} }
saveGameSettingsToFile("lastCustomGamSettings.mgg");
} }
else if (listBoxFogOfWar.mouseClick(x, y)) { else if (listBoxFogOfWar.mouseClick(x, y)) {
needToRepublishToMasterserver = true; needToRepublishToMasterserver = true;
@@ -370,6 +375,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
needToSetChangedGameSettings = true; needToSetChangedGameSettings = true;
lastSetChangedGameSettings = time(NULL); lastSetChangedGameSettings = time(NULL);
} }
saveGameSettingsToFile("lastCustomGamSettings.mgg");
} }
else if (listBoxEnableObserverMode.mouseClick(x, y)) { else if (listBoxEnableObserverMode.mouseClick(x, y)) {
needToRepublishToMasterserver = true; needToRepublishToMasterserver = true;
@@ -379,6 +385,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
needToSetChangedGameSettings = true; needToSetChangedGameSettings = true;
lastSetChangedGameSettings = time(NULL); lastSetChangedGameSettings = time(NULL);
} }
saveGameSettingsToFile("lastCustomGamSettings.mgg");
} }
else if(listBoxTileset.mouseClick(x, y)){ else if(listBoxTileset.mouseClick(x, y)){
needToRepublishToMasterserver = true; needToRepublishToMasterserver = true;
@@ -388,6 +395,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
needToSetChangedGameSettings = true; needToSetChangedGameSettings = true;
lastSetChangedGameSettings = time(NULL); lastSetChangedGameSettings = time(NULL);
} }
saveGameSettingsToFile("lastCustomGamSettings.mgg");
} }
else if(listBoxTechTree.mouseClick(x, y)){ else if(listBoxTechTree.mouseClick(x, y)){
reloadFactions(); reloadFactions();
@@ -399,10 +407,12 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
needToSetChangedGameSettings = true; needToSetChangedGameSettings = true;
lastSetChangedGameSettings = time(NULL); lastSetChangedGameSettings = time(NULL);
} }
saveGameSettingsToFile("lastCustomGamSettings.mgg");
} }
else if(listBoxPublishServer.mouseClick(x, y)&&listBoxPublishServer.getEditable()){ else if(listBoxPublishServer.mouseClick(x, y)&&listBoxPublishServer.getEditable()){
needToRepublishToMasterserver = true; needToRepublishToMasterserver = true;
soundRenderer.playFx(coreData.getClickSoundC()); soundRenderer.playFx(coreData.getClickSoundC());
saveGameSettingsToFile("lastCustomGamSettings.mgg");
} }
else else
{ {
@@ -443,6 +453,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
needToSetChangedGameSettings = true; needToSetChangedGameSettings = true;
lastSetChangedGameSettings = time(NULL);; lastSetChangedGameSettings = time(NULL);;
} }
saveGameSettingsToFile("lastCustomGamSettings.mgg");
} }
else if(listBoxFactions[i].mouseClick(x, y)){ else if(listBoxFactions[i].mouseClick(x, y)){
needToRepublishToMasterserver = true; needToRepublishToMasterserver = true;
@@ -452,6 +463,7 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
needToSetChangedGameSettings = true; needToSetChangedGameSettings = true;
lastSetChangedGameSettings = time(NULL);; lastSetChangedGameSettings = time(NULL);;
} }
saveGameSettingsToFile("lastCustomGamSettings.mgg");
} }
else if(listBoxTeams[i].mouseClick(x, y)) else if(listBoxTeams[i].mouseClick(x, y))
{ {
@@ -462,11 +474,10 @@ void MenuStateCustomGame::mouseClick(int x, int y, MouseButton mouseButton){
needToSetChangedGameSettings = true; needToSetChangedGameSettings = true;
lastSetChangedGameSettings = time(NULL);; lastSetChangedGameSettings = time(NULL);;
} }
}
}
}
saveGameSettingsToFile("lastCustomGamSettings.mgg"); saveGameSettingsToFile("lastCustomGamSettings.mgg");
}
}
}
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
} }
@@ -876,6 +887,8 @@ void MenuStateCustomGame::loadGameSettings(GameSettings *gameSettings) {
int factionCount= 0; int factionCount= 0;
ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface(); ServerInterface* serverInterface= NetworkManager::getInstance().getServerInterface();
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] Line: %d\n",__FILE__,__FUNCTION__,__LINE__);
gameSettings->setDescription(formatString(mapFiles[listBoxMap.getSelectedItemIndex()])); gameSettings->setDescription(formatString(mapFiles[listBoxMap.getSelectedItemIndex()]));
gameSettings->setMap(mapFiles[listBoxMap.getSelectedItemIndex()]); gameSettings->setMap(mapFiles[listBoxMap.getSelectedItemIndex()]);
gameSettings->setTileset(tilesetFiles[listBoxTileset.getSelectedItemIndex()]); gameSettings->setTileset(tilesetFiles[listBoxTileset.getSelectedItemIndex()]);