- added more error checking in scenarios
This commit is contained in:
parent
e4cec7319e
commit
2b0e9e40d3
|
@ -287,10 +287,14 @@ void MenuStateScenario::update() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void MenuStateScenario::launchGame() {
|
void MenuStateScenario::launchGame() {
|
||||||
|
printf("In [%s::%s Line: %d] scenarioInfo.file [%s] [%s][%s][%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,scenarioInfo.file.c_str(),scenarioInfo.tilesetName.c_str(),scenarioInfo.mapName.c_str(),scenarioInfo.techTreeName.c_str());
|
||||||
|
|
||||||
|
if(scenarioInfo.file != "" && scenarioInfo.tilesetName != "" && scenarioInfo.mapName != "" && scenarioInfo.techTreeName != "") {
|
||||||
GameSettings gameSettings;
|
GameSettings gameSettings;
|
||||||
loadGameSettings(&scenarioInfo, &gameSettings);
|
loadGameSettings(&scenarioInfo, &gameSettings);
|
||||||
program->setState(new Game(program, &gameSettings, false));
|
program->setState(new Game(program, &gameSettings, false));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void MenuStateScenario::setScenario(int i) {
|
void MenuStateScenario::setScenario(int i) {
|
||||||
listBoxScenario.setSelectedItemIndex(i);
|
listBoxScenario.setSelectedItemIndex(i);
|
||||||
|
|
|
@ -155,8 +155,8 @@ string Scenario::getFunctionName(const XmlNode *scriptNode){
|
||||||
|
|
||||||
void Scenario::loadScenarioInfo(string file, ScenarioInfo *scenarioInfo) {
|
void Scenario::loadScenarioInfo(string file, ScenarioInfo *scenarioInfo) {
|
||||||
//printf("[%s:%s] Line: %d file [%s]\n",__FILE__,__FUNCTION__,__LINE__,file.c_str());
|
//printf("[%s:%s] Line: %d file [%s]\n",__FILE__,__FUNCTION__,__LINE__,file.c_str());
|
||||||
//if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] file [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,file.c_str());
|
if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] file [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,file.c_str());
|
||||||
printf("In [%s::%s Line: %d] file [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,file.c_str());
|
//printf("In [%s::%s Line: %d] file [%s]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,file.c_str());
|
||||||
|
|
||||||
Lang &lang= Lang::getInstance();
|
Lang &lang= Lang::getInstance();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user