Skip to content

Commit

Permalink
Revert "Show the turn dialog before updating the GUI for the incoming…
Browse files Browse the repository at this point in the history
… player."

This reverts commit aa34fcc.

Fixes #4238
  • Loading branch information
jostephd committed Aug 16, 2019
1 parent fb4fd54 commit a5a32a7
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 6 deletions.
4 changes: 0 additions & 4 deletions src/play_controller.cpp
Expand Up @@ -1192,10 +1192,6 @@ void play_controller::play_turn()

// If a side is empty skip over it.
if (!current_team().is_empty()) {
// Show the turn dialog now, before the minimap is redrawn and before healing is animated.
if(current_team().is_local_human() && current_team().is_proxy_human()) {
show_turn_dialog();
}
init_side_begin();
if(gamestate_->init_side_done()) {
// This is the case in a reloaded game where the side was initialized before saving the game.
Expand Down
1 change: 0 additions & 1 deletion src/play_controller.hpp
Expand Up @@ -293,7 +293,6 @@ class play_controller : public controller_base, public events::observer, public
void fire_start();
void start_game();
virtual void init_gui();
virtual void show_turn_dialog() {}
void finish_side_turn();
void finish_turn(); //this should not throw an end turn or end level exception
bool enemies_visible() const;
Expand Down
1 change: 1 addition & 0 deletions src/playmp_controller.cpp
Expand Up @@ -122,6 +122,7 @@ void playmp_controller::play_human_turn()
const std::unique_ptr<countdown_clock> timer(saved_game_.mp_settings().mp_countdown
? new countdown_clock(current_team())
: nullptr);
show_turn_dialog();
if(undo_stack().can_undo()) {
// If we reload a networked mp game we cannot undo moves made before the save
// because other players already received them
Expand Down
2 changes: 2 additions & 0 deletions src/playsingle_controller.cpp
Expand Up @@ -458,6 +458,8 @@ void playsingle_controller::execute_gotos()
}

void playsingle_controller::play_human_turn() {
show_turn_dialog();

if (!preferences::disable_auto_moves()) {
execute_gotos();
}
Expand Down
2 changes: 1 addition & 1 deletion src/playsingle_controller.hpp
Expand Up @@ -65,7 +65,7 @@ class playsingle_controller : public play_controller
protected:
virtual void play_side_impl() override;
void before_human_turn();
virtual void show_turn_dialog() override;
void show_turn_dialog();
void execute_gotos();
virtual void play_human_turn();
virtual void after_human_turn();
Expand Down

0 comments on commit a5a32a7

Please sign in to comment.