Author: alink
Date: Mon May 18 00:38:03 2009
New Revision: 35721
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35721&view=rev
Log:
Small simplification/optimization of propagate_invalidation()
Modified:
trunk/src/display.cpp
Modified: trunk/src/display.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/display.cpp?rev=35721&r1=35720&r2=35721&view=diff
==============================================================================
--- trunk/src/display.cpp (original)
+++ trunk/src/display.cpp Mon May 18 00:38:03 2009
@@ -2334,28 +2334,22 @@
if(invalidateAll_)
return false;
- bool has_inval = false;
+ if(locs.size()<=1)
+ return false; // propagation never needed
+
+ // search the first hex invalidated (if any)
std::set<map_location>::const_iterator i = locs.begin();
- for(; i != locs.end(); ++i) {
- if (invalidated_.count(*i)) {
- has_inval = true;
- break; // 'i' will be used later
- }
- }
-
- // if no invalidation or one but nothing to propagate, return false
- if (!has_inval || locs.size()<=1)
- return false;
-
- // propagate invalidation (but skip the already invalidated hex)
- bool res = false;
- std::set<map_location>::const_iterator j = locs.begin();
- for(; j != locs.end(); ++j) {
- if(j != i)
- res |= invalidated_.insert(*j).second;
- }
-
- return res; // always true, but cleaner like that
+ for(; i != locs.end() && invalidated_.count(*i) == 0 ; ++i) {}
+
+ if (i == locs.end())
+ return false; // no invalidation, don't propagate
+
+ // propagate invalidation
+ // 'i' is already in, but I suspect that splitting the range is bad
+ // especially because locs are often adjacents
+ size_t previous_size = invalidated_.size();
+ invalidated_.insert(locs.begin(), locs.end());
+ return previous_size < invalidated_.size();
}
bool display::invalidate_visible_locations_in_rect(const SDL_Rect& rect)
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
