Merge lp:~widelands-dev/widelands/bug_1801340_loading_screen into lp:widelands

Proposed by Toni Förster
Status: Merged
Merged at revision: 8911
Proposed branch: lp:~widelands-dev/widelands/bug_1801340_loading_screen
Merge into: lp:widelands
Diff against target: 25 lines (+2/-2)
2 files modified
src/network/gameclient.cc (+1/-1)
src/network/gamehost.cc (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug_1801340_loading_screen
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+358378@code.launchpad.net

Commit message

don't provide the filename for the standard background image

To post a comment you must log in.
Revision history for this message
Benedikt Straub (nordfriese) wrote :

Scenarios can have a custom background image. Those are screen-filling and should be centered (that´s the reason for the different alignment in the if-else I think). Did you test what they look like now (e.g. campaign maps in bar and emp campaigns, photographs in fri campaign)?

Revision history for this message
Toni Förster (stonerl) wrote :

Will do this later. Didn't consider those, though. So I guess they'll look worse now...

Revision history for this message
Toni Förster (stonerl) wrote :

Barbarians look good in 1280x800 but that's the maximum resolution I can test. Any way to unlock all campaigns without playing them?

Revision history for this message
Benedikt Straub (nordfriese) wrote :

You can either edit your ~/.widelands/save/campvis file or start WL with the commandline option --scenario=campaigns/fri01.wmf

You can also test higher resolutions using
--xres=4000 --yres=3000 --fullscreen=false
and then move the window around the screen to see it all.
(The result when the resolution is significantly larger than the image size is important because a glitch here would be a bug for players with a very large screen)

Revision history for this message
GunChleoc (gunchleoc) wrote :

I agree that the campaign scenario backgrounds should stay centered.

Revision history for this message
Toni Förster (stonerl) wrote :

The problem seems to be in gamehost.cc:

UI::ProgressWindow* loader_ui = new UI::ProgressWindow("images/loadscreens/progress.png");

and gameclient.cc

loader_ui.reset(new UI::ProgressWindow("images/loadscreens/progress.png"));

Since they provide a file-name, only the if-clause is called. Have to test this thoroughly.

8908. By Toni Förster

don't provide the filename for the standard background image

Revision history for this message
Toni Förster (stonerl) wrote :

Okay that did the trick. Only images that cam be centered should be passed as an argument.

Revision history for this message
GunChleoc (gunchleoc) wrote :

Looking good :)

@bunnybot merge

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/network/gameclient.cc'
--- src/network/gameclient.cc 2018-10-14 10:55:09 +0000
+++ src/network/gameclient.cc 2018-11-06 17:05:36 +0000
@@ -171,7 +171,7 @@
171 game.set_write_syncstream(g_options.pull_section("global").get_bool("write_syncstreams", true));171 game.set_write_syncstream(g_options.pull_section("global").get_bool("write_syncstreams", true));
172172
173 try {173 try {
174 UI::ProgressWindow* loader_ui = new UI::ProgressWindow("images/loadscreens/progress.png");174 UI::ProgressWindow* loader_ui = new UI::ProgressWindow();
175 d->modal = loader_ui;175 d->modal = loader_ui;
176 std::vector<std::string> tipstext;176 std::vector<std::string> tipstext;
177 tipstext.push_back("general_game");177 tipstext.push_back("general_game");
178178
=== modified file 'src/network/gamehost.cc'
--- src/network/gamehost.cc 2018-09-26 06:05:27 +0000
+++ src/network/gamehost.cc 2018-11-06 17:05:36 +0000
@@ -627,7 +627,7 @@
627627
628 try {628 try {
629 std::unique_ptr<UI::ProgressWindow> loader_ui;629 std::unique_ptr<UI::ProgressWindow> loader_ui;
630 loader_ui.reset(new UI::ProgressWindow("images/loadscreens/progress.png"));630 loader_ui.reset(new UI::ProgressWindow());
631631
632 std::vector<std::string> tipstext;632 std::vector<std::string> tipstext;
633 tipstext.push_back("general_game");633 tipstext.push_back("general_game");

Subscribers

People subscribed via source and target branches

to status/vote changes: