← Back to team overview

widelands-dev team mailing list archive

[Merge] lp:~widelands-dev/widelands/fix_tut1_destroy_quarries into lp:widelands

 

GunChleoc has proposed merging lp:~widelands-dev/widelands/fix_tut1_destroy_quarries into lp:widelands.

Commit message:
Trigger destroy_quarries_message in Tutorial 1 with 1 message.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_tut1_destroy_quarries/+merge/294699

In case the user deletes the first message before the second one comes in.

Bug reported on the forum https://wl.widelands.org/forum/topic/1970/
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_tut1_destroy_quarries into lp:widelands.
=== modified file 'data/campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua'
--- data/campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua	2015-11-04 16:48:56 +0000
+++ data/campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua	2016-05-14 07:55:41 +0000
@@ -333,7 +333,7 @@
    remove_all_rocks(first_quarry_field:region(6))
 
    -- Wait for messages to arrive
-   while #plr.inbox < 2 do sleep(300) end
+   while #plr.inbox < 1 do sleep(300) end
 
    local o = message_box_objective(plr, destroy_quarries_message)
 


Follow ups