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

Merge branch 'add_has_ally/enemy' into 1.12

Browse source
This commit is contained in:
Chris Beck 2014-07-12 10:53:47 -04:00
commit 1d384d0592
1 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/side_filter.cpp
View file

@ -173,6 +173,37 @@ bool side_filter::match_internal(const team &t) const
}
}
const vconfig& has_enemy = cfg_.child("has_enemy");
if(!has_enemy.null()) {
side_filter s_filter(has_enemy);
const std::vector<int>& teams = s_filter.get_teams();
bool found = false;
BOOST_FOREACH(const int side, teams) {
if((*resources::teams)[side - 1].is_enemy(t.side()))
{
found = true;
break;
}
}
if (!found) return false;
}
const vconfig& has_ally = cfg_.child("has_ally");
if(!has_ally.null()) {
side_filter s_filter(has_ally);
const std::vector<int>& teams = s_filter.get_teams();
bool found = false;
BOOST_FOREACH(const int side, teams) {
if(!(*resources::teams)[side - 1].is_enemy(t.side()))
{
found = true;
break;
}
}
if (!found) return false;
}
const config::attribute_value cfg_controller = cfg_["controller"];
if (!cfg_controller.blank())
{