upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-10 13:38:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve pathfind::teleport_map constructor.

Browse Source 
Remove an unused parameter.

Send a not modified vector as const ref instead as copy.

Make some other parameters const as well.
This commit is contained in:
Mark de Wever 2011-03-06 19:08:17 +00:00
parent f7d02d6a76
commit 6db76d8d5f
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/pathfind/teleport.cpp
View File

@ -92,14 +92,22 @@ config pathfind::teleport_group::to_config() const {
return retval;
}
pathfind::teleport_map::teleport_map(std::vector<teleport_group> groups, const unit& u, const unit_map &/*units*/, const team &viewing_team, bool see_all, bool ignore_units)
: teleport_map_(), sources_(), targets_() {
pathfind::teleport_map::teleport_map(
const std::vector<teleport_group>& groups
, const unit& u
, const team &viewing_team
, const bool see_all
, const bool ignore_units)
: teleport_map_()
, sources_()
, targets_()
{
for (std::vector<teleport_group>::iterator it = groups.begin(); it != groups.end(); ++it) {
foreach(const teleport_group& group, groups) {
teleport_pair locations;
it->get_teleport_pair(locations, u, ignore_units);
if (!see_all && !it->always_visible() && viewing_team.is_enemy(u.side())) {
group.get_teleport_pair(locations, u, ignore_units);
if (!see_all && !group.always_visible() && viewing_team.is_enemy(u.side())) {
teleport_pair filter_locs;
foreach(const map_location &loc, locations.first)
if(!viewing_team.fogged(loc))
@ -110,7 +118,7 @@ pathfind::teleport_map::teleport_map(std::vector<teleport_group> groups, const u
locations.first.swap(filter_locs.first);
locations.second.swap(filter_locs.second);
}
std::string teleport_id = it->get_teleport_id();
std::string teleport_id = group.get_teleport_id();
std::set<map_location>::iterator source_it = locations.first.begin();
for (; source_it != locations.first.end(); ++source_it ) {
@ -184,7 +192,7 @@ const pathfind::teleport_map pathfind::get_teleport_locations(const unit &u,
const std::vector<teleport_group>& global_groups = resources::tunnels->get();
groups.insert(groups.end(), global_groups.begin(), global_groups.end());
return teleport_map(groups, u, *resources::units, viewing_team, see_all, ignore_units);
return teleport_map(groups, u, viewing_team, see_all, ignore_units);
}
pathfind::manager::manager(const config &cfg) : tunnels_(), id_(lexical_cast_default<int>(cfg["next_teleport_group_id"], 0)) {

10
src/pathfind/teleport.hpp
View File

@ -74,9 +74,13 @@ private:
class teleport_map {
public:
teleport_map(std::vector<teleport_group> teleport_groups, const unit& u,
const unit_map &units, const team &viewing_team, bool see_all,
bool ignore_units);
teleport_map(
const std::vector<teleport_group>& teleport_groups
, const unit& u
, const team &viewing_team
, const bool see_all
, const bool ignore_units);
teleport_map() :
teleport_map_(), sources_(), targets_() {
}