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

use resources::units in find_visible_unit

Browse Source
This commit is contained in:
Ali El Gariani 2010-06-24 01:49:19 +00:00
parent a16260cd61
commit 3380c92571
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/menu_events.cpp
View File

@ -1358,12 +1358,12 @@ void menu_handler::rename_unit(mouse_handler& mousehandler)
unit_map::iterator menu_handler::current_unit(mouse_handler& mousehandler)
{
unit_map::iterator res = find_visible_unit(units_, mousehandler.get_last_hex(),
unit_map::iterator res = find_visible_unit(mousehandler.get_last_hex(),
teams_[gui_->viewing_team()]);
if(res != units_.end()) {
return res;
} else {
return find_visible_unit(units_, mousehandler.get_selected_hex(),
return find_visible_unit(mousehandler.get_selected_hex(),
teams_[gui_->viewing_team()]);
}
}

4
src/mouse_events.cpp
View File

@ -274,12 +274,12 @@ unit_map::iterator mouse_handler::selected_unit()
unit_map::iterator mouse_handler::find_unit(const map_location& hex)
{
return find_visible_unit(units_, hex, viewing_team());
return find_visible_unit(hex, viewing_team());
}
unit_map::const_iterator mouse_handler::find_unit(const map_location& hex) const
{
return find_visible_unit(units_, hex, viewing_team());
return find_visible_unit(hex, viewing_team());
}
map_location mouse_handler::current_unit_attacks_from(const map_location& loc)

5
src/unit.cpp
View File

@ -2742,9 +2742,10 @@ int side_upkeep(int side)
return res;
}
unit_map::iterator find_visible_unit(unit_map& units, const map_location &loc,
unit_map::iterator find_visible_unit(const map_location &loc,
const team& current_team, bool see_all)
{
unit_map& units = *resources::units;
if (!resources::game_map->on_board(loc)) return units.end();
unit_map::iterator u = units.find(loc);
if (see_all) return u;
@ -2758,7 +2759,7 @@ unit_map::iterator find_visible_unit(unit_map& units, const map_location &loc,
const unit *get_visible_unit(const unit_map &units, const map_location &loc,
const team &current_team, bool see_all)
{
unit_map::const_iterator ui = find_visible_unit(units, loc,
unit_map::const_iterator ui = find_visible_unit(loc,
current_team, see_all);
if (ui == units.end()) return NULL;
return &*ui;

9
src/unit.hpp
View File

@ -476,16 +476,9 @@ int side_units_cost(int side_num);
int side_upkeep(int side_num);
unit_map::iterator find_visible_unit(unit_map &units, const map_location &loc,
unit_map::iterator find_visible_unit(const map_location &loc,
const team &current_team, bool see_all = false);
inline unit_map::const_iterator find_visible_unit(const unit_map &units,
const map_location &loc, const team &current_team, bool see_all = false)
{
return find_visible_unit(const_cast<unit_map &>(units), loc,
current_team, see_all);
}
const unit *get_visible_unit(const unit_map &units, const map_location &loc,
const team &current_team, bool see_all = false);