openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Several more tests for scenario loading

Browse Source
This commit is contained in:
Celtic Minstrel
2015-07-07 17:10:09 -04:00
parent 42734c8599
commit 2218513aa5
16 changed files with 523 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/fileio_scen.cpp
View File

@@ -757,7 +757,6 @@ void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario) {
game->GetText(&scenario.init_spec);
} else if(type == "start-town") {
game->GetText(&scenario.which_town_start);
// TODO: Make sure town is valid
} else if(type == "town-start") {
scenario.where_start = readLocFromXml(*game);
} else if(type == "outdoor-start") {
@@ -776,7 +775,6 @@ void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario) {
auto town_p = &scenario.town_mods[town_mods].spec;
location& loc = scenario.town_mods[town_mods];
loc = readLocFromXml(*game, "add-", "town", town_p);
// TODO: Make sure town is valid
town_mods++;
} else if(type == "special-item") {
scenario.special_items.emplace_back();