Commandline: --campaign-skip-story skips [message]s during prestart a…

…nd start events
wesnoth · Sep 20, 2018 · f770d6b · f770d6b
1 parent 7951dc2
commit f770d6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/play_controller.cpp b/src/play_controller.cpp
@@ -374,6 +374,7 @@ void play_controller::fire_start()
 {
 	gamestate().gamedata_.set_phase(game_data::START);
 	pump().fire("start");
+	skip_story_ = false; // Show [message]s from now on even with --campaign-skip-story
 	// start event may modify start turn with WML, reflect any changes.
 	gamestate().gamedata_.get_variable("turn_number") = int(turn());
 	refresh_objectives();

diff --git a/src/scripting/game_lua_kernel.cpp b/src/scripting/game_lua_kernel.cpp
@@ -2693,7 +2693,7 @@ int game_lua_kernel::intf_deselect_hex(lua_State*)
  */
 int game_lua_kernel::intf_is_skipping_messages(lua_State *L)
 {
-	bool skipping = play_controller_.is_skipping_replay();
+	bool skipping = play_controller_.is_skipping_replay() || play_controller_.is_skipping_story();
 	if (!skipping) {
 		skipping = game_state_.events_manager_->pump().context_skip_messages();
 	}