Merge lp:~widelands-dev/widelands/bug-1603763 into lp:widelands

[TiborB]

I think this can be investigated bit more deeply, but this fix is good as well, and safe....

The bottom line is that recalc_default_resources now make sure that calculated resource is not INVALID_RESOURCE - then it calls clear_resources() instead of setting this value as a resource. Only kNoResource is allowed in such situation.

[kaputtnik (franku)]

For investigation the second attached scenario contains a map where a crash happen with current trunk when the debug window is used on position 0/0.

This branch is fine.

review: Approve (testing)

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1190. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/145398847.
Appveyor build 1029. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1603763-1029.

[SirVer (sirver)]

I agree this is an improvement. One nit though: I think INVALID_INDEX == -1, but I cannot check. If that is the case, the first condition in the OR can be removed.

Otherwise lgtm.

review: Approve

[bunnybot (widelandsofficial)]

Bunnybot encountered an error while working on this merge proposal:

<urlopen error timed out>

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1190. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/145398847.
Appveyor build 1029. State: failed. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1603763-1029.

[TiborB (tiborb95)]

I see appveyor failed, "Memory exhausted"??

@SirVer:
INVALID_INDEX == 255 and kNoResource == 254

[SirVer (sirver)]

thanks for the explanation. I guess appveyor went out of memory when trying to link - nothing can be done about this. Travis is happy. Let's get this in.

@bunnybot merge

=== modified file 'src/logic/map.cc'
--- src/logic/map.cc	2016-05-07 18:54:04 +0000
+++ src/logic/map.cc	2016-07-17 19:45:29 +0000
@@ -249,7 +249,7 @@
 			}
 			amount /= 6;
 
-			if (res == -1 || !amount) {
+			if (res == -1 || res == INVALID_INDEX || res == Widelands::kNoResource || !amount) {
 				clear_resources(f);
 			} else {
 				initialize_resources(f, res, amount);