Merge lp:~widelands-dev/widelands/bug-1406298-campvis-file into lp:widelands

[GunChleoc]

Check for campvis file with and without fix_cross_file

This branch is completely untested. We need to verify the bug on trunk on WIndows, then check if this branch fixes it.

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3555. State: failed. Details: https://travis-ci.org/widelands/widelands/builds/384302515.
Appveyor build 3359. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1406298_campvis_file-3359.

[Klaus Halfmann (klaus-halfmann)]

Thats odd. In trunk I find the contant as:

logic/filesystem_constants.h:const std::string kCampVisFile = "save/campvis";

but here it is kCampvisFile?

The save/campvis is some properties files is used to maker later
campaings visible once there predecessor have been solved.

[Klaus Halfmann (klaus-halfmann)]

Fixed that typo, can test this with windows 10 only, though.

review: Needs Resubmitting

[Klaus Halfmann (klaus-halfmann)]

OK, can reproduce this on master-3414

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3616. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/396375715.
Appveyor build 3416. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1406298_campvis_file-3416.

[Klaus Halfmann (klaus-halfmann)]

Uhhm appveyor fails when bulding the installer with:

Error on line 112 in c:\projects\widelands\utils\win32\innosetup\Widelands.iss:
Source file "C:\msys64\mingw64\bin\libicuuc58.dll" does not exist.
or "C:\msys64\mingw32\bin\libicuuc58.dll"

Who knows about that windows setup? Sound like some mingw configuration is broken?

[kaputtnik (franku)]

You have to merge trunk into this branch, because trunk has fixed this error. See: https://wl.widelands.org/forum/topic/4217/?page=2#post-25160

[Klaus Halfmann (klaus-halfmann)]

kaputtnick: thanks for the hint, lets try again.

review: Needs Resubmitting

[Klaus Halfmann (klaus-halfmann)]

Still no Appveyor build here?

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 3638. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/401293949.
Appveyor build 3437. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1406298_campvis_file-3437.

[GunChleoc (gunchleoc)]

Tested under Linux and Windows. Thanks for cleaning up after me!

@bunnybot merge

[bunnybot (widelandsofficial)]

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

Travis build 3638. State: errored. Details: https://travis-ci.org/widelands/widelands/builds/401293949.

[Klaus Halfmann (klaus-halfmann)]

One transient failure on Travis with one job only.

> WARNING: The following packages cannot be authenticated!
> zlib1g-dev zlib1g

appveyor is ok

@bunnybot merge force

review: Approve

=== modified file 'src/wui/load_or_save_game.cc'
--- src/wui/load_or_save_game.cc	2018-06-08 16:36:29 +0000
+++ src/wui/load_or_save_game.cc	2018-07-07 20:12:27 +0000
@@ -318,7 +318,7 @@
 	Widelands::GamePreloadPacket gpdp;
 
 	for (const std::string& gamefilename : gamefiles) {
-		if (gamefilename == g_fs->fix_cross_file("save/campvis")) {
+		if (gamefilename == kCampVisFile || gamefilename == g_fs->fix_cross_file(kCampVisFile)) {
 			continue;
 		}