mail[Wesnoth-commits] r20108 - in /trunk: changelog src/terrain_filter.cpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by patrick_X99 on September 05, 2007 - 02:02:
Author: sapient
Date: Wed Sep  5 02:01:40 2007
New Revision: 20108

URL: http://svn.gna.org/viewcvs/wesnoth?rev=20108&view=rev
Log:
rename [filter_adjacent] in SLF to [filter_adjacent_location] (to avoid 
confusion)

Modified:
    trunk/changelog
    trunk/src/terrain_filter.cpp

Modified: trunk/changelog
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=20108&r1=20107&r2=20108&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Wed Sep  5 02:01:40 2007
@@ -15,8 +15,9 @@
      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")

Modified: trunk/src/terrain_filter.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/terrain_filter.cpp?rev=20108&r1=20107&r2=20108&view=diff
==============================================================================
--- trunk/src/terrain_filter.cpp (original)
+++ trunk/src/terrain_filter.cpp Wed Sep  5 02:01:40 2007
@@ -106,10 +106,10 @@
        }
 
        //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 @@
 
        //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);




Related Messages


Powered by MHonArc, Updated Wed Sep 05 05:00:19 2007