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

Don't scroll to an enemy leader that has an effective [hides] ability (#3492)

Browse source
This commit is contained in:
jostephd 2018-08-27 07:31:05 +00:00 • committed by Jyrki Vesterinen
parent 5f7b1853dd
commit 24cb784d4b
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game_display.cpp
View file

@ -188,7 +188,7 @@ void game_display::scroll_to_leader(int side, SCROLL_TYPE scroll_type, bool forc
{
unit_map::const_iterator leader = dc_->units().find_leader(side);
if(leader.valid()) {
if(leader.valid() && leader->is_visible_to_team(dc_->get_team(viewing_side()), *dc_, false)) {
scroll_to_tile(leader->get_location(), scroll_type, true, force);
}
}

3
src/menu_events.cpp
View file

@ -593,7 +593,8 @@ bool menu_handler::end_turn(int side_num)
void menu_handler::goto_leader(int side_num)
{
unit_map::const_iterator i = units().find_leader(side_num);
if(i != units().end()) {
const display_context& dc = gui_->get_disp_context();
if(i != units().end() && i->is_visible_to_team(dc.get_team(gui_->viewing_side()), dc, false)) {
gui_->scroll_to_tile(i->get_location(), game_display::WARP);
}
}

2
src/units/unit.hpp
View file

@ -925,7 +925,7 @@ private:
/**
* @}
* @defgroup unit_trait Trait and upkeep functions
* @}
* @{
*/
public:
/**