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

less redraw_everything calls when receiving [change_controller]

Browse source 
we now only call redraw_everything() when the gui actually needs
updating. In particular this fixes an annoing flickering in some cases
where a gui2 dialog is shown while a [change_controller] is received.

(cherry picked from commit 247e08e1d5)
This commit is contained in:
gfgtdf 2018-03-31 15:27:16 +02:00
parent d926c21352
commit 94a9dbe927
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/playturn.cpp
View file

@ -191,16 +191,21 @@ turn_info::PROCESS_DATA_RESULT turn_info::process_network_data(const config& cfg
resources::controller->on_not_observer();
}
auto disp_set_team = [](int side_index) {
const bool side_changed = static_cast<int>(display::get_singleton()->viewing_team()) != side_index;
display::get_singleton()->set_team(side_index);
if(side_changed) {
display::get_singleton()->redraw_everything();
display::get_singleton()->recalculate_minimap();
video2::trigger_full_redraw();
}
};
if (resources::gameboard->is_observer() || (resources::gameboard->teams())[display::get_singleton()->playing_team()].is_local_human()) {
display::get_singleton()->set_team(display::get_singleton()->playing_team());
display::get_singleton()->redraw_everything();
display::get_singleton()->recalculate_minimap();
video2::trigger_full_redraw();
disp_set_team(display::get_singleton()->playing_team());
} else if (tm.is_local_human()) {
display::get_singleton()->set_team(side - 1);
display::get_singleton()->redraw_everything();
display::get_singleton()->recalculate_minimap();
video2::trigger_full_redraw();
disp_set_team(side - 1);
}
resources::whiteboard->on_change_controller(side,tm);