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

Combine town-shifting data into a single structure

Browse Source
This commit is contained in:
Celtic Minstrel
2015-02-06 16:56:17 -05:00
parent f609711e27
commit a14d3b5ff8
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/scenedit/scen.core.cpp
View File

@@ -2538,15 +2538,15 @@ static bool save_add_town(cDialog& me) {
for(i = 0; i < 10; i++) {
std::string id = std::to_string(i + 1);
scenario.town_to_add_to[i] = me["town" + id].getTextAsNum();
if(cre(scenario.town_to_add_to[i],
scenario.town_mods[i].spec = me["town" + id].getTextAsNum();
if(cre(scenario.town_mods[i].spec,
-1,199,"Town number must be from 0 to 199 (or -1 for no effect).","",&me)) return false;
scenario.flag_to_add_to_town[i][0] = me["flag" + id + "-x"].getTextAsNum();
if(cre(scenario.flag_to_add_to_town[i][0],
scenario.town_mods[i].x = me["flag" + id + "-x"].getTextAsNum();
if(cre(scenario.town_mods[i].x,
0,299,"First part of flag must be from 0 to 299.","",&me)) return false;
scenario.flag_to_add_to_town[i][1] = me["flag" + id + "-y"].getTextAsNum();
if(cre(scenario.flag_to_add_to_town[i][1],
0,9,"Second part of flag must be from 0 to 9.","",&me)) return false;
scenario.town_mods[i].y = me["flag" + id + "-y"].getTextAsNum();
if(cre(scenario.town_mods[i].y,
0,49,"Second part of flag must be from 0 to 49.","",&me)) return false;
}
return true;
}
@@ -2556,9 +2556,9 @@ static void put_add_town_in_dlog(cDialog& me) {
for(i = 0; i < 10; i++) {
std::string id = std::to_string(i + 1);
me["town" + id].setTextToNum(scenario.town_to_add_to[i]);
me["flag" + id + "-x"].setTextToNum(scenario.flag_to_add_to_town[i][0]);
me["flag" + id + "-y"].setTextToNum(scenario.flag_to_add_to_town[i][1]);
me["town" + id].setTextToNum(scenario.town_mods[i].spec);
me["flag" + id + "-x"].setTextToNum(scenario.town_mods[i].x);
me["flag" + id + "-y"].setTextToNum(scenario.town_mods[i].y);
}
}

8
src/scenedit/scen.fileio.cpp
View File

@@ -171,11 +171,11 @@ static void writeScenarioToXml(ticpp::Printer&& data) {
}
}
for(int i = 0; i < 10; i++) {
if(is_minmax(0, scenario.towns.size(), scenario.town_to_add_to[i])) {
if(is_minmax(0, scenario.towns.size(), scenario.town_mods[i].spec)) {
data.OpenElement("town-flag");
data.PushAttribute("town", scenario.town_to_add_to[i]);
data.PushAttribute("add-x", scenario.flag_to_add_to_town[i][0]);
data.PushAttribute("add-y", scenario.flag_to_add_to_town[i][1]);
data.PushAttribute("town", scenario.town_mods[i].spec);
data.PushAttribute("add-x", scenario.town_mods[i].x);
data.PushAttribute("add-y", scenario.town_mods[i].y);
data.CloseElement("town-flag");
}
}