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

Allow comma-separated list of ids in SUFs (FR bug #16720).

Browse source
This commit is contained in:
Anonymissimus 2010-09-18 20:53:41 +00:00
parent 2d099daf23
commit ea1d39cd9e
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/unit.cpp
View file

@ -1223,9 +1223,22 @@ bool unit::internal_matches_filter(const vconfig& cfg, const map_location& loc,
return false;
}
config::attribute_value cfg_id = cfg["id"];
if (!cfg_id.blank() && cfg_id.str() != id()) {
return false;
const config::attribute_value cfg_id = cfg["id"];
if (!cfg_id.blank()) {
const std::string& id = cfg_id;
const std::string& this_id = this->id();
if (id == this_id) {
}
else if (std::find(id.begin(), id.end(), ',') == id.end()){
return false;
}
else {
const std::vector<std::string>& ids = utils::split(id);
if (std::find(ids.begin(), ids.end(), this_id) == ids.end()) {
return false;
}
}
}
// Allow 'speaker' as an alternative to id, since people use it so often