Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix for auto-loading scenarios, new timer for the scenario preview was being called when the menu was already destroyed sometimes.

This commit is contained in:
Mark Vejvoda 2011-04-03 02:11:45 +00:00
parent cf706491e1
commit 6384c4c611
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/glest_game/menu/menu_state_scenario.cpp
View File

@ -141,6 +141,7 @@ void MenuStateScenario::mouseClick(int x, int y, MouseButton mouseButton) {
else if(buttonPlayNow.mouseClick(x,y)){
soundRenderer.playFx(coreData.getClickSoundC());
launchGame();
return;
}
else if(listBoxScenario.mouseClick(x, y)){
try {
@ -214,6 +215,7 @@ void MenuStateScenario::update() {
CoreData &coreData= CoreData::getInstance();
soundRenderer.playFx(coreData.getClickSoundC());
launchGame();
return;
}
}
@ -372,9 +374,21 @@ void MenuStateScenario::loadScenarioPreviewTexture(){
}
void MenuStateScenario::loadGameSettings(const ScenarioInfo *scenarioInfo, GameSettings *gameSettings){
if(listBoxScenario.getSelectedItemIndex() < 0) {
char szBuf[1024]="";
sprintf(szBuf,"listBoxScenario.getSelectedItemIndex() < 0, = %d",listBoxScenario.getSelectedItemIndex());
throw runtime_error(szBuf);
}
else if(listBoxScenario.getSelectedItemIndex() >= scenarioFiles.size()) {
char szBuf[1024]="";
sprintf(szBuf,"listBoxScenario.getSelectedItemIndex() >= scenarioFiles.size(), = [%d][%d]",listBoxScenario.getSelectedItemIndex(),(int)scenarioFiles.size());
throw runtime_error(szBuf);
}
int factionCount= 0;
//printf("\n\n\n$$$$$$$$$$$$$ [%s]\n\n\n",scenarioFiles[listBoxScenario.getSelectedItemIndex()].c_str());
gameSettings->setDescription(formatString(scenarioFiles[listBoxScenario.getSelectedItemIndex()]));
gameSettings->setMap(scenarioInfo->mapName);
gameSettings->setTileset(scenarioInfo->tilesetName);