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

remove support for [object] unit_type= and [object]unit_gender=

Browse source 
1. Both are covered by [object][filter].

2. They were undocumented in the wiki.

3. They are scheduled for removal since early 1.7.

(patch #3211 by brilliand)
This commit is contained in:
Anonymissimus 2012-03-29 15:28:17 +00:00
parent 75898197f4
commit b63962cb5d
1 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/unit.cpp
View file

@ -2336,25 +2336,7 @@ void unit::add_modification(const std::string& type, const config& mod, bool no_
std::vector<t_string> effects_description;
foreach (const config &effect, mod.child_range("effect"))
{
// See if the effect only applies to certain unit types
const std::string &type_filter = effect["unit_type"];
if(type_filter.empty() == false) {
const std::vector<std::string>& types = utils::split(type_filter);
if(std::find(types.begin(),types.end(),type_id()) == types.end()) {
continue;
}
}
// See if the effect only applies to certain genders
const std::string &gender_filter = effect["unit_gender"];
if(gender_filter.empty() == false) {
const std::string& gender = gender_string(gender_);
const std::vector<std::string>& genders = utils::split(gender_filter);
if(std::find(genders.begin(),genders.end(),gender) == genders.end()) {
continue;
}
}
/** @todo The above two filters can be removed in 1.7 they're covered by the SUF. */
// Apply SUF. (Filtering on location is probably a bad idea though.)
// Apply SUF.
if (const config &afilter = effect.child("filter"))
if (!matches_filter(vconfig(afilter), loc_)) continue;