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

A few more scenario read tests

Browse Source 
- Introduce enum for scenario content rating
This commit is contained in:
Celtic Minstrel
2015-07-07 18:58:35 -04:00
parent 2218513aa5
commit 137a3aa5d4
25 changed files with 208 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/fileio_scen.cpp
View File

@@ -653,6 +653,7 @@ void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario) {
} else if(type == "icon") {
// TODO: This element can have some attributes on it.
elem->GetText(&scenario.intro_pic);
scenario.intro_mess_pic = scenario.intro_pic;
} else if(type == "id") {
elem->GetText(&scenario.campaign_id, false);
} else if(type == "version") {
@@ -689,12 +690,7 @@ void readScenarioFromXml(ticpp::Document&& data, cScenario& scenario) {
} else if(type == "ratings") {
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("content", xBadVal::CONTENT, val, content->Row(), content->Column(), fname);
content->GetText(&scenario.rating);
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);