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

rename [filter_adjacent] in SLF to [filter_adjacent_location]

Browse source 
(to avoid confusion)
This commit is contained in:
Patrick Parker 2007-09-05 00:01:40 +00:00
parent 49106110f3
commit cb29743eab
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
changelog
View file

@ -15,8 +15,9 @@ Version 1.3.7+svn:
a game to avoid ambiguity in case of multiple games with the same name
* show observer team chat messages in the 'Chat Log' window
* WML engine:
* now tag [filter_adjacent] is supported in the Standard Unit Filter
* now tag [filter_adjacent] is supported in the Standard Location Filter
* now tag [filter_adjacent] is supported in the Standard Unit Filter (SUF)
* now tag [filter_adjacent_location] is supported in the Standard Location
Filter (SLF)
* remove the unused [neighbour_unit_filter] animation filter, now that SUF
does it for us (and better)
* a minus sign in front of a cardinal direction now reverses it ("-s"="n")

8
src/terrain_filter.cpp
View file

@ -106,10 +106,10 @@ static bool terrain_matches_internal(const gamemap& map, const gamemap::location
}
//Allow filtering on adjacent locations
if(cfg.has_child("filter_adjacent")) {
if(cfg.has_child("filter_adjacent_location")) {
gamemap::location adjacent[6];
get_adjacent_tiles(loc, adjacent);
const vconfig::child_list& adj_filt = cfg.get_children("filter_adjacent");
const vconfig::child_list& adj_filt = cfg.get_children("filter_adjacent_location");
vconfig::child_list::const_iterator i, i_end, i_begin = adj_filt.begin();
for (i = i_begin, i_end = adj_filt.end(); i != i_end; ++i) {
int match_count = 0;
@ -350,9 +350,9 @@ void get_locations(const gamemap& map, std::set<gamemap::location>& locs, const
//handle location filter
terrain_filter_cache tfc;
if(filter.has_child("filter_adjacent")) {
if(filter.has_child("filter_adjacent_location")) {
tfc.adjacent_matches = new std::vector<std::set<gamemap::location> >();
const vconfig::child_list& adj_filt = filter.get_children("filter_adjacent");
const vconfig::child_list& adj_filt = filter.get_children("filter_adjacent_location");
for (unsigned i = 0; i < adj_filt.size() && i <= max_loop; ++i) {
std::set<gamemap::location> adj_set;
get_locations(map, adj_set, adj_filt[i], game_status, units, flat_tod, max_loop);