Skip to content
Permalink
Browse files
Fix for launching network Scenarios
The client had to complete some game settings locally like path and so on.
  • Loading branch information
titiger committed Jan 13, 2015
1 parent 3f96679 commit 8284b3ecdecbe6af096f6489abaa6dd64f90006e
Showing with 20 additions and 1 deletion.
  1. +20 −1 source/glest_game/menu/menu_state_connected_game.cpp
@@ -3594,7 +3594,26 @@ void MenuStateConnectedGame::update() {
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__);

launchingNewGame = true;
program->setState(new Game(program, clientInterface->getGameSettings(),false));

GameSettings gameSettings = *clientInterface->getGameSettings();
// complete game settings with local stuff
if(gameSettings.getScenario()!="")
{
string scenario = gameSettings.getScenario();
listBoxScenario.setSelectedItem(formatString(scenario));
string file = Scenario::getScenarioPath(dirList, scenario);

bool isTutorial = Scenario::isGameTutorial(file);
Scenario::loadScenarioInfo(file, &scenarioInfo, isTutorial);

gameSettings.setScenarioDir(Scenario::getScenarioPath(dirList, scenarioInfo.name));

gameSettings.setDefaultResources(scenarioInfo.defaultResources);
gameSettings.setDefaultUnits(scenarioInfo.defaultUnits);
gameSettings.setDefaultVictoryConditions(scenarioInfo.defaultVictoryConditions);
}

program->setState(new Game(program, &gameSettings,false));
return;
}
}

0 comments on commit 8284b3e

Please sign in to comment.