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

[Toni Förster]

don't provide the filename for the standard background image

[Benedikt Straub (nordfriese)]

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)?

[Toni Förster (stonerl)]

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

[Toni Förster (stonerl)]

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

[Benedikt Straub (nordfriese)]

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)

[GunChleoc (gunchleoc)]

I agree that the campaign scenario backgrounds should stay centered.

[Toni Förster (stonerl)]

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.

[Toni Förster (stonerl)]

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

[GunChleoc (gunchleoc)]

Looking good :)

@bunnybot merge

review: Approve

=== 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 @@
 	game.set_write_syncstream(g_options.pull_section("global").get_bool("write_syncstreams", true));
 
 	try {
-		UI::ProgressWindow* loader_ui = new UI::ProgressWindow("images/loadscreens/progress.png");
+		UI::ProgressWindow* loader_ui = new UI::ProgressWindow();
 		d->modal = loader_ui;
 		std::vector<std::string> tipstext;
 		tipstext.push_back("general_game");
 
=== 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 @@
 
 	try {
 		std::unique_ptr<UI::ProgressWindow> loader_ui;
-		loader_ui.reset(new UI::ProgressWindow("images/loadscreens/progress.png"));
+		loader_ui.reset(new UI::ProgressWindow());
 
 		std::vector<std::string> tipstext;
 		tipstext.push_back("general_game");