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

Handle properly multialiased terrains

Browse source
This commit is contained in:
Benoît Timbert 2006-02-19 12:01:16 +00:00
parent af0becbd8a
commit 7c03d80e19
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/unit_abilities.cpp
View file

@ -47,8 +47,15 @@ bool ability::filter::matches_filter(const std::string& terrain, int lawful_bonu
} else if((*i)["tod"] != "") {
tod_filters.push_back((*i)["tod"]);
}
if(terrain_filters.size() && std::find(terrain_filters.begin(),terrain_filters.end(),terrain) == terrain_filters.end()) {
return false;
if(terrain_filters.size()) {
bool matches_filter = false;
for (std::string::const_iterator t = terrain.begin(); t != terrain.end(); ++i) {
std::string ts(1,*t);
matches_filter |= (std::find(terrain_filters.begin(),terrain_filters.end(),ts) == terrain_filters.end());
}
if(!matches_filter) {
return false;
}
}
if(tod_filters.size() && std::find(tod_filters.begin(),tod_filters.end(),tod_string) == tod_filters.end()) {
return false;