widelands

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

  1. fix_tut1_destroy_quarries
  2. Merge into trunk
Proposed by GunChleoc
Status: Merged
Merged at revision: 8001
Proposed branch: lp:~widelands-dev/widelands/fix_tut1_destroy_quarries
Merge into: lp:widelands
Diff against target: 11 lines (+1/-1)
1 file modified
data/campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/fix_tut1_destroy_quarries
Reviewer Review Type Date Requested Status
Klaus Halfmann compile, play Approve
Review via email: mp+294699@code.launchpad.net

Commit message

Trigger destroy_quarries_message in Tutorial 1 with 1 message.

Description of the change

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/

To post a comment you must log in.
Revision history for this message
Klaus Halfmann (klaus-halfmann) wrote :

This was an easy one :-)

review: Approve (compile, play)
Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks!

@bunnybot merge

Revision history for this message
Miroslav Remák (miroslavr256) wrote :

Umm, this kinda invalidates the following message box talking about having received multiple messages. Also, I think a much better fix would be to count messages tied to fields first_quarry_field and second_quarry_field.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua'
2--- data/campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua 2015-11-04 16:48:56 +0000
3+++ data/campaigns/tutorial01_basic_control.wmf/scripting/mission_thread.lua 2016-05-14 07:55:41 +0000
4@@ -333,7 +333,7 @@
5 remove_all_rocks(first_quarry_field:region(6))
6
7 -- Wait for messages to arrive
8- while #plr.inbox < 2 do sleep(300) end
9+ while #plr.inbox < 1 do sleep(300) end
10
11 local o = message_box_objective(plr, destroy_quarries_message)
12

Subscribers

People subscribed via source and target branches

to status/vote changes: