0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

In [leader_goal], never set facet ID to * or a number

Browse source
This commit is contained in:
Celtic Minstrel 2016-02-26 18:15:14 -05:00 • committed by mattsc
parent e2ea9cd699
commit b0b02d61c6
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ai/configuration.cpp
View file

@ -309,9 +309,12 @@ void configuration::expand_simplified_aspects(side_number side, config &cfg) {
facet_config["turns"] = turns;
facet_config["time_of_day"] = time_of_day;
facet_config.add_child("value", child.cfg);
if (child.key == "leader_goal") {
if (child.key == "leader_goal" && !child.cfg["id"].empty()) {
// Use id= attribute (if present) as the facet ID
facet_config["id"] = child.cfg["id"];
const std::string& id = child.cfg["id"];
if(id != "*" && id.find_first_not_of("0123456789") != std::string::npos) {
facet_config["id"] = child.cfg["id"];
}
}
facet_configs.push_back(std::make_pair(child.key, facet_config));
}