remove playsingle_controller::play_scenario parameter

wesnoth · Mar 2, 2015 · 4102afc · 4102afc
1 parent e676f89
commit 4102afc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/game_initialization/playcampaign.cpp b/src/game_initialization/playcampaign.cpp
@@ -187,7 +187,7 @@ static LEVEL_RESULT playsingle_scenario(const config& game_config,
 	playsingle_controller playcontroller(state_of_game.get_starting_pos(), state_of_game, ticks, game_config, tdata, disp.video(), skip_replay);
 	LOG_NG << "created objects... " << (SDL_GetTicks() - playcontroller.get_ticks()) << "\n";
 
-	LEVEL_RESULT res = playcontroller.play_scenario(story, skip_replay);
+	LEVEL_RESULT res = playcontroller.play_scenario(story);
 
 	if (res == QUIT)
 	{
@@ -220,7 +220,7 @@ static LEVEL_RESULT playmp_scenario(const config& game_config,
 
 	playmp_controller playcontroller(state_of_game.get_starting_pos(), state_of_game, ticks,
 		game_config, tdata, disp.video(), skip_replay, blindfold_replay, io_type == IO_SERVER);
-	LEVEL_RESULT res = playcontroller.play_scenario(story, skip_replay);
+	LEVEL_RESULT res = playcontroller.play_scenario(story);
 
 	//Check if the player started as mp client and changed to host
 	if (io_type == IO_CLIENT && playcontroller.is_host())

diff --git a/src/playsingle_controller.cpp b/src/playsingle_controller.cpp
@@ -315,8 +315,7 @@ void playsingle_controller::play_scenario_main_loop() {
 }
 
 LEVEL_RESULT playsingle_controller::play_scenario(
-	const config::const_child_itors &story,
-	bool skip_replay)
+	const config::const_child_itors &story)
 {
 	LOG_NG << "in playsingle_controller::play_scenario()...\n";
 
@@ -326,7 +325,7 @@ LEVEL_RESULT playsingle_controller::play_scenario(
 	}
 	sound::commit_music_changes();
 
-	if(!skip_replay) {
+	if(!this->is_skipping_replay()) {
 		show_story(*gui_, get_scenario_name(), story);
 	}
 	gui_->labels().read(level_);

diff --git a/src/playsingle_controller.hpp b/src/playsingle_controller.hpp
@@ -32,8 +32,7 @@ class playsingle_controller : public play_controller
 		const int ticks, const config& game_config, const tdata_cache & tdata, CVideo& video, bool skip_replay);
 	virtual ~playsingle_controller();
 
-	LEVEL_RESULT play_scenario(const config::const_child_itors &story,
-		bool skip_replay);
+	LEVEL_RESULT play_scenario(const config::const_child_itors &story);
 	void play_scenario_init();
 	void play_scenario_main_loop();