widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands.

Commit message:
Back out r8841.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1789837 in widelands: "Make splash screen optional"
  https://bugs.launchpad.net/widelands/+bug/1789837

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/remove-broken-splashscreen-skip/+merge/355529
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands.

=== modified file 'src/ui_fsmenu/options.cc'
--- src/ui_fsmenu/options.cc	2018-08-31 17:23:04 +0000
+++ src/ui_fsmenu/options.cc	2018-09-24 08:48:15 +0000
@@ -119,7 +119,6 @@
 
      fullscreen_(&box_interface_left_, Vector2i::zero(), _("Fullscreen"), "", 0),
      inputgrab_(&box_interface_left_, Vector2i::zero(), _("Grab Input"), "", 0),
-     splashscreen_(&box_interface_left_, Vector2i::zero(), _("Show Splashscreen"), "", 0),
      sb_maxfps_(&box_interface_left_,
                 0,
                 0,
@@ -245,7 +244,6 @@
 	box_interface_left_.add(&resolution_dropdown_);
 	box_interface_left_.add(&fullscreen_);
 	box_interface_left_.add(&inputgrab_);
-	box_interface_left_.add(&splashscreen_);
 	box_interface_left_.add(&sb_maxfps_);
 
 	// Windows
@@ -326,7 +324,6 @@
 
 	fullscreen_.set_state(opt.fullscreen);
 	inputgrab_.set_state(opt.inputgrab);
-	splashscreen_.set_state(opt.splashscreen);
 
 	// Windows options
 	snap_win_overlap_only_.set_state(opt.snap_win_overlap_only);
@@ -394,7 +391,6 @@
 
 	fullscreen_.set_desired_size(column_width, fullscreen_.get_h());
 	inputgrab_.set_desired_size(column_width, inputgrab_.get_h());
-	splashscreen_.set_desired_size(column_width, splashscreen_.get_h());
 	sb_maxfps_.set_unit_width(column_width / 2);
 	sb_maxfps_.set_desired_size(column_width, sb_maxfps_.get_h());
 
@@ -568,7 +564,6 @@
 	}
 	os_.fullscreen = fullscreen_.get_state();
 	os_.inputgrab = inputgrab_.get_state();
-	os_.splashscreen = splashscreen_.get_state();
 	os_.maxfps = sb_maxfps_.get_value();
 
 	// Windows options
@@ -629,7 +624,6 @@
 	opt.yres = opt_section_.get_int("yres", DEFAULT_RESOLUTION_H);
 	opt.fullscreen = opt_section_.get_bool("fullscreen", false);
 	opt.inputgrab = opt_section_.get_bool("inputgrab", false);
-	opt.splashscreen = opt_section_.get_bool("show_splashscreen", false);
 	opt.maxfps = opt_section_.get_int("maxfps", 25);
 
 	// Windows options
@@ -671,7 +665,6 @@
 	opt_section_.set_int("yres", opt.yres);
 	opt_section_.set_bool("fullscreen", opt.fullscreen);
 	opt_section_.set_bool("inputgrab", opt.inputgrab);
-	opt_section_.set_bool("show_splashscreen", opt.splashscreen);
 	opt_section_.set_int("maxfps", opt.maxfps);
 
 	// Windows options

=== modified file 'src/ui_fsmenu/options.h'
--- src/ui_fsmenu/options.h	2018-08-31 17:23:04 +0000
+++ src/ui_fsmenu/options.h	2018-09-24 08:48:15 +0000
@@ -47,7 +47,6 @@
 		int32_t yres;
 		bool fullscreen;
 		bool inputgrab;
-		bool splashscreen;
 		uint32_t maxfps;
 
 		// Windows options
@@ -133,7 +132,6 @@
 	UI::Dropdown<uintptr_t> resolution_dropdown_;
 	UI::Checkbox fullscreen_;
 	UI::Checkbox inputgrab_;
-	UI::Checkbox splashscreen_;
 	UI::SpinBox sb_maxfps_;
 	UI::MultilineTextarea translation_info_;
 

=== modified file 'src/wlapplication.cc'
--- src/wlapplication.cc	2018-09-18 18:59:10 +0000
+++ src/wlapplication.cc	2018-09-24 08:48:15 +0000
@@ -438,13 +438,11 @@
 			throw;
 		}
 	} else {
-		if (g_options.pull_section("global").get_bool("show_splashscreen", true)) {
-			g_sound_handler.start_music("intro");
+		g_sound_handler.start_music("intro");
 
-			{
-				FullscreenMenuIntro intro;
-				intro.run<FullscreenMenuBase::MenuTarget>();
-			}
+		{
+			FullscreenMenuIntro intro;
+			intro.run<FullscreenMenuBase::MenuTarget>();
 		}
 
 		g_sound_handler.change_music("menu", 1000);