simplify play_controller ctor

- `start_faded` was always true (the default value value was never used)
- 'skip_replay' was only set in playmp_controller which had already other
  code to set it (also it is not used in the ctor)
This commit is contained in:
gfgtdf 2024-04-09 01:25:01 +02:00
parent 71739b372e
commit 8225916bfc
6 changed files with 10 additions and 14 deletions

View file

@ -56,7 +56,7 @@ level_result::type campaign_controller::playsingle_scenario(end_level_data &end_
? state_.get_replay_starting_point()
: state_.get_starting_point();
playsingle_controller playcontroller(starting_point, state_, false);
playsingle_controller playcontroller(starting_point, state_);
LOG_NG << "created objects... " << (SDL_GetTicks() - playcontroller.get_ticks());
if(is_replay_) {

View file

@ -129,7 +129,7 @@ static void clear_resources()
resources::classification = nullptr;
}
play_controller::play_controller(const config& level, saved_game& state_of_game, bool skip_replay, bool start_faded)
play_controller::play_controller(const config& level, saved_game& state_of_game)
: controller_base()
, observer()
, quit_confirmation()
@ -151,12 +151,12 @@ play_controller::play_controller(const config& level, saved_game& state_of_game,
, xp_mod_(new unit_experience_accelerator(level["experience_modifier"].to_int(100)))
, statistics_context_(new statistics_t(state_of_game.statistics()))
, replay_(new replay(state_of_game.get_replay()))
, skip_replay_(skip_replay)
, skip_replay_(false)
, skip_story_(state_of_game.skip_story())
, did_autosave_this_turn_(true)
, did_tod_sound_this_turn_(false)
, map_start_()
, start_faded_(start_faded)
, start_faded_(true)
, victory_music_()
, defeat_music_()
, scope_(hotkey::scope_game)

View file

@ -61,9 +61,7 @@ class play_controller : public controller_base, public events::observer, public
{
public:
play_controller(const config& level,
saved_game& state_of_game,
bool skip_replay,
bool start_faded = false);
saved_game& state_of_game);
virtual ~play_controller();
//event handler, overridden from observer

View file

@ -49,7 +49,7 @@ static lg::log_domain log_network("network");
#define ERR_NW LOG_STREAM(err, log_network)
playmp_controller::playmp_controller(const config& level, saved_game& state_of_game, mp_game_metadata* mp_info)
: playsingle_controller(level, state_of_game, mp_info && mp_info->skip_replay)
: playsingle_controller(level, state_of_game)
, network_processing_stopped_(false)
, next_scenario_notified_(false)
, blindfold_(*gui_, mp_info && mp_info->skip_replay_blindfolded)
@ -59,9 +59,7 @@ playmp_controller::playmp_controller(const config& level, saved_game& state_of_g
// upgrade hotkey handler to the mp (network enabled) version
hotkey_handler_.reset(new hotkey_handler(*this, saved_game_));
if(!mp_info || mp_info->current_turn <= turn()) {
skip_replay_ = false;
}
skip_replay_ = mp_info && mp_info->skip_replay && mp_info->current_turn > turn();
if(gui_->is_blindfolded() && !is_observer()) {
blindfold_.unblind();

View file

@ -63,8 +63,8 @@ static lg::log_domain log_engine("engine");
static lg::log_domain log_enginerefac("enginerefac");
#define LOG_RG LOG_STREAM(info, log_enginerefac)
playsingle_controller::playsingle_controller(const config& level, saved_game& state_of_game, bool skip_replay)
: play_controller(level, state_of_game, skip_replay, true) // start faded
playsingle_controller::playsingle_controller(const config& level, saved_game& state_of_game)
: play_controller(level, state_of_game)
, cursor_setter_(cursor::NORMAL)
, end_turn_requested_(false)
, ai_fallback_(false)

View file

@ -46,7 +46,7 @@ private:
class playsingle_controller : public play_controller
{
public:
playsingle_controller(const config& level, saved_game& state_of_game, bool skip_replay);
playsingle_controller(const config& level, saved_game& state_of_game);
~playsingle_controller();
level_result::type play_scenario(const config& level);