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

SUF: New filter "has_variation"; renamed "variation_type"->"variation"

Browse source 
The new has_variation SUF attribute filters if a unit has a variation
child type with the given id. If the unit is a variation itself the
siblings are considered.
This commit is contained in:
fendrin 2013-09-19 01:01:08 +02:00
parent 7e95aa90bb
commit 66ee6c4857
1 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/unit.cpp
View file

@ -1357,7 +1357,7 @@ bool unit::internal_matches_filter(const vconfig& cfg, const map_location& loc,
}
// The variation_type could be a comma separated list of types
config::attribute_value cfg_variation_type = cfg["variation_type"];
config::attribute_value cfg_variation_type = cfg["variation"];
if (!cfg_variation_type.blank())
{
const std::string type_ids = cfg_variation_type.str();
@ -1380,6 +1380,32 @@ bool unit::internal_matches_filter(const vconfig& cfg, const map_location& loc,
}
}
// The has_variation_type could be a comma separated list of types
config::attribute_value cfg_has_variation_type = cfg["has_variation"];
if (!cfg_has_variation_type.blank())
{
const std::string& var_ids = cfg_has_variation_type.str();
const std::string& this_var = variation_;
if ( var_ids == this_var ) {
// pass
} else {
bool match = false;
const std::vector<std::string>& variation_types = utils::split(var_ids);
// If this unit is a variation itself then search in the base unit's variations.
const unit_type* const type = this_var.empty() ? type_ : unit_types.find(type_->base_id());
BOOST_FOREACH(const std::string& variation_id, variation_types) {
if (type->has_variation(variation_id)) {
match = true;
break;
}
}
if (!match) return false;
}
}
config::attribute_value cfg_ability = cfg["ability"];
if (!cfg_ability.blank())
{