widelands-dev team mailing list archive

[Jens Beyer <Qcumber-some@xxxxxxxxxxxxx>]

Jens Beyer has proposed merging lp:~qcumber-some/widelands/bug1332856 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1332856 in widelands: "Regression from one_world: Crash when opening message regarding resources"
  https://bugs.launchpad.net/widelands/+bug/1332856

For more details, see:
https://code.launchpad.net/~qcumber-some/widelands/bug1332856/+merge/224028

This is the emergency fix for this bug, preventing the crashes.

Further todo should be fixing this correctly (different bug).
-- 
https://code.launchpad.net/~qcumber-some/widelands/bug1332856/+merge/224028
Your team Widelands Developers is requested to review the proposed merge of lp:~qcumber-some/widelands/bug1332856 into lp:widelands.

=== modified file 'src/logic/worker.cc'
--- src/logic/worker.cc	2014-06-16 18:58:02 +0000
+++ src/logic/worker.cc	2014-06-21 17:34:48 +0000
@@ -963,7 +963,7 @@
 			// that might not be around forever.
 			snprintf(message,
 			         sizeof(message),
-			         "<rt image=world/resources/%s_1f.png>"
+			         "<rt image=world/resources/pics/%s4.png>"
 			         "<p font-size=14 font-face=DejaVuSerif>%s</p></rt>",
 			         rdescr->name().c_str(),
 			         _("A geologist found resources."));

=== added file 'world/resources/pics/water4.png'
Binary files world/resources/pics/water4.png	1970-01-01 00:00:00 +0000 and world/resources/pics/water4.png	2014-06-21 17:34:48 +0000 differ