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

Fix scenario difficulty increasing by 1 between saving and loading

Browse Source
This commit is contained in:
Celtic Minstrel
2015-02-13 20:34:58 -05:00
parent a029836720
commit a7da59c858
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tools/fileio_scen.cpp
View File

@@ -644,14 +644,18 @@ static void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario) {
}
}
} else if(type == "ratings") {
elem->FirstChildElement("content")->GetText(&val);
Element* content = elem->FirstChildElement("content");
Element* difficulty = elem->FirstChildElement("difficulty");
content->GetText(&val);
if(val == "g") scenario.rating = 0;
else if(val == "pg") scenario.rating = 1;
else if(val == "r") scenario.rating = 2;
else if(val == "nc17") scenario.rating = 3;
else throw xBadVal(type, "content", val, elem->FirstChild("content")->Row(), elem->FirstChild("content")->Column(), fname);
elem->FirstChildElement("difficulty")->GetText(&scenario.difficulty);
// TODO: Verify difficulty is in range 1..4
else throw xBadVal("content", xBadVal::CONTENT, val, content->Row(), content->Column(), fname);
difficulty->GetText(&scenario.difficulty);
if(scenario.difficulty < 1 || scenario.difficulty > 4)
throw xBadVal("difficulty", xBadVal::CONTENT, std::to_string(scenario.difficulty), difficulty->Row(),difficulty->Column(), fname);
scenario.difficulty--;
} else if(type == "flags") {
Iterator<Element> flag;
for(flag = flag.begin(elem.Get()); flag != flag.end(); flag++) {