diff --git a/src/play_controller.cpp b/src/play_controller.cpp index b373a2b91b90..ff016e8266f6 100644 --- a/src/play_controller.cpp +++ b/src/play_controller.cpp @@ -561,19 +561,17 @@ void play_controller::fire_preload() gamedata_.get_variable("turn_number") = int(turn()); game_events::fire("preload"); } -void play_controller::fire_prestart(bool execute) +void play_controller::fire_prestart() { // pre-start events must be executed before any GUI operation, // as those may cause the display to be refreshed. - if (execute){ - update_locker lock_display(gui_->video()); - gamedata_.set_phase(game_data::PRESTART); - game_events::fire("prestart"); - check_end_level(); - // prestart event may modify start turn with WML, reflect any changes. - start_turn_ = turn(); - gamedata_.get_variable("turn_number") = int(start_turn_); - } + update_locker lock_display(gui_->video()); + gamedata_.set_phase(game_data::PRESTART); + game_events::fire("prestart"); + check_end_level(); + // prestart event may modify start turn with WML, reflect any changes. + start_turn_ = turn(); + gamedata_.get_variable("turn_number") = int(start_turn_); } void play_controller::fire_start(bool execute){ diff --git a/src/play_controller.hpp b/src/play_controller.hpp index 79703e66cee2..b60abd5314e6 100644 --- a/src/play_controller.hpp +++ b/src/play_controller.hpp @@ -196,7 +196,7 @@ class play_controller : public controller_base, public events::observer, public void init_managers(); ///preload events cannot be synced void fire_preload(); - void fire_prestart(bool execute); + void fire_prestart(); void fire_start(bool execute); virtual void init_gui(); possible_end_play_signal init_side(bool is_replay = false); diff --git a/src/playsingle_controller.cpp b/src/playsingle_controller.cpp index b45c239c9800..ba85932850c9 100644 --- a/src/playsingle_controller.cpp +++ b/src/playsingle_controller.cpp @@ -368,7 +368,7 @@ possible_end_play_signal playsingle_controller::play_scenario_init(end_level_dat //we can only use a set_scontext_synced with a non empty recorder. set_scontext_synced sync; - HANDLE_END_PLAY_SIGNAL( fire_prestart(true) ); + HANDLE_END_PLAY_SIGNAL( fire_prestart() ); init_gui(); past_prestart = true; LOG_NG << "first_time..." << (recorder.is_skipping() ? "skipping" : "no skip") << "\n"; diff --git a/src/replay_controller.cpp b/src/replay_controller.cpp index dd18fce0228d..770ab1b60103 100644 --- a/src/replay_controller.cpp +++ b/src/replay_controller.cpp @@ -350,7 +350,7 @@ void replay_controller::reset_replay() */ set_scontext_synced sync; - fire_prestart(true); + fire_prestart(); init_gui(); fire_start(true); }