Author: mordante
Date: Mon Aug 18 18:39:54 2008
New Revision: 28722
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28722&view=rev
Log:
Rename restrict to restrict_size. Restrict is a keyword in C99 and might be a
C++ keyword in the future.
Modified:
trunk/src/game_events.cpp
trunk/src/terrain_filter.hpp
Modified: trunk/src/game_events.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/game_events.cpp?rev=28722&r1=28721&r2=28722&view=diff
==============================================================================
--- trunk/src/game_events.cpp (original)
+++ trunk/src/game_events.cpp Mon Aug 18 18:39:54 2008
@@ -2453,7 +2453,7 @@
std::set<gamemap::location> res;
terrain_filter filter(cfg, *game_map, *status_ptr, *units);
- filter.restrict(game_config::max_loop);
+ filter.restrict_size(game_config::max_loop);
filter.get_locations(res);
state_of_game->clear_variable_cfg(variable);
@@ -3054,7 +3054,7 @@
else {
std::set<gamemap::location> locs;
terrain_filter filter(cfg, *game_map, *status_ptr,
*units);
- filter.restrict(game_config::max_loop);
+ filter.restrict_size(game_config::max_loop);
filter.get_locations(locs);
status_ptr->add_time_area(id, locs,
cfg.get_parsed_config());
}
Modified: trunk/src/terrain_filter.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/terrain_filter.hpp?rev=28722&r1=28721&r2=28722&view=diff
==============================================================================
--- trunk/src/terrain_filter.hpp (original)
+++ trunk/src/terrain_filter.hpp Mon Aug 18 18:39:54 2008
@@ -50,7 +50,7 @@
//restrict: limits the allowed radius size and also limits nesting
// The purpose to limit the time spent for WML handling
// Note: this feature is not fully implemented, e.g. SLF inside SUF
inside SLF
- void restrict(const size_t max_loop) { max_loop_ = max_loop; }
+ void restrict_size(const size_t max_loop) { max_loop_ = max_loop; }
//flatten: use base time of day -- ignore illumination ability
void flatten(const bool flat_tod=true) { flat_ = flat_tod; }
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
