Code LGTM, 1 nit. Will do some testing.
Diff comments:
>
> === modified file 'src/ui_fsmenu/launch_game.cc'
> --- src/ui_fsmenu/launch_game.cc 2019-02-23 11:00:49 +0000
> +++ src/ui_fsmenu/launch_game.cc 2019-04-26 11:33:38 +0000
> @@ -78,6 +86,23 @@
> delete lua_;
> }
>
> +void FullscreenMenuLaunchGame::update_peaceful_mode() {
> + bool forbidden = peaceful_mode_forbidden_ ||
> settings_->settings().scenario || settings_->settings().savegame;
> + peaceful_.set_enabled(!forbidden && settings_->can_change_map());
> + if (forbidden) {
> + peaceful_.set_state(false);
> + }
> + if (settings_->settings().scenario) {
> + peaceful_.set_tooltip(_("The relations between players are set
> by the scenario."));
> + } else if (settings_->settings().savegame) {
> + peaceful_.set_tooltip(_("The game is a saved game – whether the
> peaceful mode is used was decided before."));
How about: The relations between players are set by the saved game.
> + } else if (peaceful_mode_forbidden_) {
> + peaceful_.set_tooltip(_("The selected win condition does not
> allow peaceful matches."));
> + } else {
> + peaceful_.set_tooltip(_("Forbid fighting between players"));
> + }
> +}
> +
> bool FullscreenMenuLaunchGame::init_win_condition_label() {
> if (settings_->settings().scenario) {
> win_condition_dropdown_.set_enabled(false);
--
https://code.launchpad.net/~widelands-dev/widelands/peaceful/+merge/365273
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/peaceful into lp:widelands.
_______________________________________________
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
