Merge lp:~qcumber-some/widelands/bug1332856 into lp:widelands

[Jens Beyer]

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

Further todo should be fixing this correctly (different bug).

[SirVer (sirver)]

hard coding is unfortunate of course. I wish there was an easy way to fix this for good.

One suggestion: Could you try adding a regression test?
Copy test/maps/plain.wmf/scripting/test_fires_do_not_burn_forever.lua to test/maps/plain.wmf/scripting/test_geologist_messages_do_not_crash.lua. Then change the plain.wmf map to contain a bunch of hills with all findable resources (do not forget water). Script geologists going to these hills (enough of them) and check after a while that 5 messages have arrived. Click on the button (via ui scripting) and delete one message after another - so that all will get rendered once.

review: Approve

[Jens Beyer (qcumber-some)]

I am working on the test, but it is blocked by bug 1332984

[Jens Beyer (qcumber-some)]

Ok, added the test.
Is this quality enough? I guess the test case is covered.

review: Needs Resubmitting

[SirVer (sirver)]

small comments. Basically looks good though.

review: Needs Fixing

[SirVer (sirver)]

Also, Tino did something too. I am confused about his merge request. Tino, can you clarify?

[Jens Beyer (qcumber-some)]

I fixed the small debug message. I guess I could not do anything about the headers in this branch. Should I create a new bug about this?

Regarding Tino's branch: This looked like Tino completed this test after fixing the other bug?
That's very nice but I didn't know he did and I made it all by myself. This branch also had merge conflicts and looked like it did not more than my branch. Now it looks like it is gone at all. Sorry by the way for not making my branch belonging to widelands-dev :-(

review: Needs Resubmitting

[Jens Beyer (qcumber-some)]

also it looks like the diff below does not show r7000 into trunk - guess that's why it is beta.

=== modified file 'src/logic/worker.cc'
--- src/logic/worker.cc	2014-06-22 16:53:47 +0000
+++ src/logic/worker.cc	2014-06-22 17:10:24 +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."));

=== modified file 'test/maps/plain.wmf/binary/heights'
Binary files test/maps/plain.wmf/binary/heights	2014-06-20 14:38:48 +0000 and test/maps/plain.wmf/binary/heights	2014-06-22 17:10:24 +0000 differ
=== modified file 'test/maps/plain.wmf/binary/resource'
Binary files test/maps/plain.wmf/binary/resource	2014-06-20 14:38:48 +0000 and test/maps/plain.wmf/binary/resource	2014-06-22 17:10:24 +0000 differ
=== modified file 'test/maps/plain.wmf/binary/terrain'
Binary files test/maps/plain.wmf/binary/terrain	2014-06-20 14:38:48 +0000 and test/maps/plain.wmf/binary/terrain	2014-06-22 17:10:24 +0000 differ
=== modified file 'test/maps/plain.wmf/elemental'
--- test/maps/plain.wmf/elemental	2014-06-20 14:38:48 +0000
+++ test/maps/plain.wmf/elemental	2014-06-22 17:10:24 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr6991[trunk] (RelWithDebInfo)
+# Automatically created by Widelands bzr6998[widelands] (Debug)
 
 [global]
 packet_version="1"

=== modified file 'test/maps/plain.wmf/extra_data'
--- test/maps/plain.wmf/extra_data	2014-06-20 14:38:48 +0000
+++ test/maps/plain.wmf/extra_data	2014-06-22 17:10:24 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr6991[trunk] (RelWithDebInfo)
+# Automatically created by Widelands bzr6998[widelands] (Debug)
 
 [global]
 packet_version="1"

=== modified file 'test/maps/plain.wmf/objective'
--- test/maps/plain.wmf/objective	2014-06-20 14:38:48 +0000
+++ test/maps/plain.wmf/objective	2014-06-22 17:10:24 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr6991[trunk] (RelWithDebInfo)
+# Automatically created by Widelands bzr6998[widelands] (Debug)
 
 [global]
 packet_version="2"

=== modified file 'test/maps/plain.wmf/player_names'
--- test/maps/plain.wmf/player_names	2014-06-20 14:38:48 +0000
+++ test/maps/plain.wmf/player_names	2014-06-22 17:10:24 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr6991[trunk] (RelWithDebInfo)
+# Automatically created by Widelands bzr6998[widelands] (Debug)
 
 [global]
 packet_version="2"

=== modified file 'test/maps/plain.wmf/player_position'
--- test/maps/plain.wmf/player_position	2014-06-20 14:38:48 +0000
+++ test/maps/plain.wmf/player_position	2014-06-22 17:10:24 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr6991[trunk] (RelWithDebInfo)
+# Automatically created by Widelands bzr6998[widelands] (Debug)
 
 [global]
 packet_version="2"

=== modified file 'test/maps/plain.wmf/port_spaces'
--- test/maps/plain.wmf/port_spaces	2014-06-20 14:38:48 +0000
+++ test/maps/plain.wmf/port_spaces	2014-06-22 17:10:24 +0000
@@ -1,4 +1,4 @@
-# Automatically created by Widelands bzr6991[trunk] (RelWithDebInfo)
+# Automatically created by Widelands bzr6998[widelands] (Debug)
 
 [global]
 packet_version="1"

=== modified file 'test/maps/plain.wmf/scripting/init.lua'
--- test/maps/plain.wmf/scripting/init.lua	2014-06-20 14:38:48 +0000
+++ test/maps/plain.wmf/scripting/init.lua	2014-06-22 17:10:24 +0000
@@ -8,6 +8,6 @@
 p1.see_all = true
 
 p1:allow_workers("all")
-prefilled_buildings(p1, { "lumberjacks_hut", 10, 10, })
+prefilled_buildings(p1, { "lumberjacks_hut", 10, 10, }, { "headquarters", 22, 25, })
 
 game.desired_speed = 50000

=== added file 'test/maps/plain.wmf/scripting/test_geologist_messages_do_not_crash.lua'
--- test/maps/plain.wmf/scripting/test_geologist_messages_do_not_crash.lua	1970-01-01 00:00:00 +0000
+++ test/maps/plain.wmf/scripting/test_geologist_messages_do_not_crash.lua	2014-06-22 17:10:24 +0000
@@ -0,0 +1,37 @@
+run(function()
+   sleep(5000)
+
+   assert_equal(1, #p1:get_buildings("headquarters"))
+
+   local hqs = p1:get_buildings("headquarters")
+   local hq = hqs[1]
+   local fhq = hq.flag
+   hq:set_workers("geologist", 2)
+
+   local field = map:get_field(25,22)
+   local flag = p1:place_flag(field)
+   local road = p1:place_road(flag, "bl", "bl", "bl", "bl")
+   sleep(1000)
+
+   local mv = wl.ui.MapView()
+   mv:click(field)
+   sleep(1000)
+
+   mv.windows.field_action.buttons.geologist:click()
+   sleep(1000)
+
+   sleep(360000)
+
+   assert_equal(6, #p1.inbox)
+   mv.buttons.messages:click()
+
+   for k,v in pairs(mv.windows.messages.buttons) do print(v.name) end
+
+   for t=0,6 do
+     sleep(1000)
+     mv.windows.messages.buttons.archive_or_restore_selected_messages:click()
+   end
+
+   print("# All Tests passed.")
+   wl.ui.MapView():close()
+end)

=== modified file 'test/maps/plain.wmf/version'
--- test/maps/plain.wmf/version	2014-06-20 14:38:48 +0000
+++ test/maps/plain.wmf/version	2014-06-22 17:10:24 +0000
@@ -1,11 +1,11 @@
-# Automatically created by Widelands bzr6991[trunk] (RelWithDebInfo)
+# Automatically created by Widelands bzr6998[widelands] (Debug)
 
 [global]
 map_source_url=
 map_release=
 map_creator_version="bzr6991[trunk]"
 map_version_major="0"
-map_version_minor="1"
-map_version_timestamp="1403272026"
+map_version_minor="3"
+map_version_timestamp="1403455628"
 packet_version="1"
 packet_compatibility="1"

=== 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-22 17:10:24 +0000 differ