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

bugfix to not crash when loading corrupt scenarios

Browse Source
This commit is contained in:
Mark Vejvoda 2013-05-03 06:03:54 +00:00
parent 775b351bc2
commit dc27d02972
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,30 +113,44 @@ MenuStateScenario::MenuStateScenario(Program *program, MainMenu *mainMenu,
showMessageBox( "Error: There are no scenarios found to load", "Error detected", false);
}
}
std::map<string,string> scenarioErrors;
for(unsigned int i = 0; i < results.size(); ++i) {
bool foundTranslatedName = false;
string current_scenario = results[i];
if(current_scenario != "") {
//printf("current_scenario [%s]\n",current_scenario.c_str());
loadScenarioInfo(Scenario::getScenarioPath(dirList, scenarioFiles[i]), &scenarioInfo );
if(scenarioInfo.namei18n != "") {
current_scenario = scenarioInfo.namei18n;
foundTranslatedName = true;
try {
if(current_scenario != "") {
//printf("current_scenario [%s]\n",current_scenario.c_str());
loadScenarioInfo(Scenario::getScenarioPath(dirList, scenarioFiles[i]), &scenarioInfo );
if(scenarioInfo.namei18n != "") {
current_scenario = scenarioInfo.namei18n;
foundTranslatedName = true;
}
}
}
if(foundTranslatedName == false) {
results[i] = formatString(current_scenario);
}
else {
results[i] = current_scenario;
}
if(foundTranslatedName == false) {
results[i] = formatString(current_scenario);
}
else {
results[i] = current_scenario;
}
}
catch(const std::exception &ex) {
char szBuf[8096]="";
snprintf(szBuf,8096,"In [%s::%s %d] Error detected:\n%s\n",__FILE__,__FUNCTION__,__LINE__,ex.what());
SystemFlags::OutputDebug(SystemFlags::debugError,szBuf);
if(SystemFlags::getSystemSettingType(SystemFlags::debugSystem).enabled) SystemFlags::OutputDebug(SystemFlags::debugSystem,"%s",szBuf);
scenarioErrors[current_scenario] = szBuf;
}
}
listBoxScenario.setItems(results);
try {
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] listBoxScenario.getSelectedItemIndex() = %d scenarioFiles.size() = %d\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,listBoxScenario.getSelectedItemIndex(),(int)scenarioFiles.size());
if(listBoxScenario.getItemCount() > 0 && listBoxScenario.getSelectedItemIndex() >= 0 && listBoxScenario.getSelectedItemIndex() < scenarioFiles.size()) {
loadScenarioInfo(Scenario::getScenarioPath(dirList, scenarioFiles[listBoxScenario.getSelectedItemIndex()]), &scenarioInfo );
labelInfo.setText(scenarioInfo.desc);
@ -153,6 +167,17 @@ MenuStateScenario::MenuStateScenario(Program *program, MainMenu *mainMenu,
mainMessageBoxState=1;
showMessageBox( "Error: " + string(ex.what()), "Error detected", false);
}
if(scenarioErrors.size() > 0) {
mainMessageBoxState=1;
string errorMsg = "";
for(std::map<string,string>::iterator iterMap = scenarioErrors.begin();
iterMap != scenarioErrors.end(); ++iterMap) {
errorMsg += "scenario: " + iterMap->first + " error text: " + iterMap->second.substr(0,400) + "\n";
}
showMessageBox( "Error loading scenario(s): " + errorMsg, "Error detected", false);
}
}
void MenuStateScenario::reloadUI() {