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

Make the single-location version of get_tiles_radius()...

Browse source 
...simpler and more efficient.
This commit is contained in:
J. Tyne 2012-07-06 02:43:53 +00:00
parent 149e6bee24
commit 6b7d4e1f56
1 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/pathutils.cpp
View file

@ -62,25 +62,6 @@ void get_tiles_in_radius(const map_location& center, const int radius,
}
static void get_tiles_radius_internal(const map_location& a, size_t radius,
std::set<map_location>& res, std::map<map_location,int>& visited)
{
visited[a] = radius;
res.insert(a);
if(radius == 0) {
return;
}
map_location adj[6];
get_adjacent_tiles(a,adj);
for(size_t i = 0; i != 6; ++i) {
if(visited.count(adj[i]) == 0 || visited[adj[i]] < int(radius)-1) {
get_tiles_radius_internal(adj[i],radius-1,res,visited);
}
}
}
/**
* Function which will add to @a result all locations within a distance of
* @a radius from @a center (including @a center itself). @a result must be
@ -89,10 +70,15 @@ static void get_tiles_radius_internal(const map_location& a, size_t radius,
void get_tiles_radius(const map_location& center, size_t radius,
std::set<map_location>& result)
{
std::map<map_location,int> visited;
get_tiles_radius_internal(center, radius, result, visited);
// Re-use some logic.
std::vector<map_location> internal_result(1, center);
get_tiles_in_radius(center, static_cast<int>(radius), internal_result);
// Convert to a set.
result.insert(internal_result.begin(), internal_result.end());
}
/**
* Function which will add to @a result all elements of @a locs, plus all
* on-board locations matching @a pred that are connected to elements of