0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commandline: --campaign-skip-story skips [message]s during prestart and start events

Browse source 
(cherry-picked from commit b64f4b42d6)
This commit is contained in:
josteph 2018-09-07 15:02:23 +00:00 • committed by loonycyborg
parent a8bded63ad
commit d5238ac5cb
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/play_controller.cpp
View file

@ -374,6 +374,9 @@ 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") = static_cast<int>(turn());

2
src/scripting/game_lua_kernel.cpp
View file

@ -2816,7 +2816,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();
}