widelands

Merge lp:~widelands-dev/widelands/remove-broken-splashscreen-skip into lp:widelands

  1. remove-broken-splashscreen-skip
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8850
Proposed branch: lp:~widelands-dev/widelands/remove-broken-splashscreen-skip
Merge into: lp:widelands
Diff against target: 101 lines (+4/-15)
3 files modified
src/ui_fsmenu/options.cc (+0/-7)
src/ui_fsmenu/options.h (+0/-2)
src/wlapplication.cc (+4/-6)
To merge this branch: bzr merge lp:~widelands-dev/widelands/remove-broken-splashscreen-skip
Reviewer Review Type Date Requested Status
Widelands Developers Pending
Review via email: mp+355529@code.launchpad.net

Commit message

Back out r8841.

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

The feature implementation in r8841 is incomplete, so I'm undoing the code change for now

@bunnybot merge

Revision history for this message
GunChleoc (gunchleoc) wrote :

Transient failure on Travis

@bunnybot merge force

Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4029. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/432395438.
Appveyor build 3825. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_remove_broken_splashscreen_skip-3825.

Revision history for this message
bunnybot (widelandsofficial) wrote :

Refusing to merge, since Travis is not green. Use @bunnybot merge force for merging anyways.

Travis build 4029. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/432395438.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Transient failure on Travis

@bunnybot merge force

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ui_fsmenu/options.cc'
2--- src/ui_fsmenu/options.cc 2018-08-31 17:23:04 +0000
3+++ src/ui_fsmenu/options.cc 2018-09-24 08:48:15 +0000
4@@ -119,7 +119,6 @@
5
6 fullscreen_(&box_interface_left_, Vector2i::zero(), _("Fullscreen"), "", 0),
7 inputgrab_(&box_interface_left_, Vector2i::zero(), _("Grab Input"), "", 0),
8- splashscreen_(&box_interface_left_, Vector2i::zero(), _("Show Splashscreen"), "", 0),
9 sb_maxfps_(&box_interface_left_,
10 0,
11 0,
12@@ -245,7 +244,6 @@
13 box_interface_left_.add(&resolution_dropdown_);
14 box_interface_left_.add(&fullscreen_);
15 box_interface_left_.add(&inputgrab_);
16- box_interface_left_.add(&splashscreen_);
17 box_interface_left_.add(&sb_maxfps_);
18
19 // Windows
20@@ -326,7 +324,6 @@
21
22 fullscreen_.set_state(opt.fullscreen);
23 inputgrab_.set_state(opt.inputgrab);
24- splashscreen_.set_state(opt.splashscreen);
25
26 // Windows options
27 snap_win_overlap_only_.set_state(opt.snap_win_overlap_only);
28@@ -394,7 +391,6 @@
29
30 fullscreen_.set_desired_size(column_width, fullscreen_.get_h());
31 inputgrab_.set_desired_size(column_width, inputgrab_.get_h());
32- splashscreen_.set_desired_size(column_width, splashscreen_.get_h());
33 sb_maxfps_.set_unit_width(column_width / 2);
34 sb_maxfps_.set_desired_size(column_width, sb_maxfps_.get_h());
35
36@@ -568,7 +564,6 @@
37 }
38 os_.fullscreen = fullscreen_.get_state();
39 os_.inputgrab = inputgrab_.get_state();
40- os_.splashscreen = splashscreen_.get_state();
41 os_.maxfps = sb_maxfps_.get_value();
42
43 // Windows options
44@@ -629,7 +624,6 @@
45 opt.yres = opt_section_.get_int("yres", DEFAULT_RESOLUTION_H);
46 opt.fullscreen = opt_section_.get_bool("fullscreen", false);
47 opt.inputgrab = opt_section_.get_bool("inputgrab", false);
48- opt.splashscreen = opt_section_.get_bool("show_splashscreen", false);
49 opt.maxfps = opt_section_.get_int("maxfps", 25);
50
51 // Windows options
52@@ -671,7 +665,6 @@
53 opt_section_.set_int("yres", opt.yres);
54 opt_section_.set_bool("fullscreen", opt.fullscreen);
55 opt_section_.set_bool("inputgrab", opt.inputgrab);
56- opt_section_.set_bool("show_splashscreen", opt.splashscreen);
57 opt_section_.set_int("maxfps", opt.maxfps);
58
59 // Windows options
60
61=== modified file 'src/ui_fsmenu/options.h'
62--- src/ui_fsmenu/options.h 2018-08-31 17:23:04 +0000
63+++ src/ui_fsmenu/options.h 2018-09-24 08:48:15 +0000
64@@ -47,7 +47,6 @@
65 int32_t yres;
66 bool fullscreen;
67 bool inputgrab;
68- bool splashscreen;
69 uint32_t maxfps;
70
71 // Windows options
72@@ -133,7 +132,6 @@
73 UI::Dropdown<uintptr_t> resolution_dropdown_;
74 UI::Checkbox fullscreen_;
75 UI::Checkbox inputgrab_;
76- UI::Checkbox splashscreen_;
77 UI::SpinBox sb_maxfps_;
78 UI::MultilineTextarea translation_info_;
79
80
81=== modified file 'src/wlapplication.cc'
82--- src/wlapplication.cc 2018-09-18 18:59:10 +0000
83+++ src/wlapplication.cc 2018-09-24 08:48:15 +0000
84@@ -438,13 +438,11 @@
85 throw;
86 }
87 } else {
88- if (g_options.pull_section("global").get_bool("show_splashscreen", true)) {
89- g_sound_handler.start_music("intro");
90+ g_sound_handler.start_music("intro");
91
92- {
93- FullscreenMenuIntro intro;
94- intro.run<FullscreenMenuBase::MenuTarget>();
95- }
96+ {
97+ FullscreenMenuIntro intro;
98+ intro.run<FullscreenMenuBase::MenuTarget>();
99 }
100
101 g_sound_handler.change_music("menu", 1000);

Subscribers

People subscribed via source and target branches

to status/vote changes: