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

locations on the map are considered to not be on a recall list

Browse source
This commit is contained in:
Patrick Parker 2007-08-26 02:06:34 +00:00
parent 1dbf802d7a
commit 393c901fb4
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.cpp
View file

@ -858,8 +858,15 @@ bool unit::internal_matches_filter(const vconfig& cfg, const gamemap::location&
}
}
// Also allow filtering on location ranges outside of the location filter
if(!cfg["x"].empty() || !cfg["y"].empty()){
if(!loc.matches_range(cfg["x"], cfg["y"])) {
const t_string& cfg_x = cfg["x"];
const t_string& cfg_y = cfg["y"];
if(!cfg_x.empty() || !cfg_y.empty()){
if(cfg_x == "recall" && cfg_y == "recall") {
//locations on the map are considered to not be on a recall list
if((!map_ && loc.valid()) || (map_ && map_->on_board(loc))) {
return false;
}
} else if(!loc.matches_range(cfg_x, cfg_y)) {
return false;
}
}