widelands-dev team mailing list archive

[Leif Sandstede <widelands@xxxxxxxxxxxx>]

Leif Sandstede has proposed merging lp:~widelands-sandstede/widelands/fix-bug-780409 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #780409 in widelands: "Scenario does not continue in empire 2 campaign"
  https://bugs.launchpad.net/widelands/+bug/780409

For more details, see:
https://code.launchpad.net/~widelands-sandstede/widelands/fix-bug-780409/+merge/60489

Simple 2 line fix for bug 780409.
Affects empire campaign 2
-- 
https://code.launchpad.net/~widelands-sandstede/widelands/fix-bug-780409/+merge/60489
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-sandstede/widelands/fix-bug-780409 into lp:widelands.

=== modified file 'campaigns/emp02.wmf/scripting/mission_thread.lua'
--- campaigns/emp02.wmf/scripting/mission_thread.lua	2011-01-04 12:17:44 +0000
+++ campaigns/emp02.wmf/scripting/mission_thread.lua	2011-05-10 11:26:30 +0000
@@ -202,10 +202,10 @@
    -- Wait for various buildings to go up
    while true do
       local rv = p1:get_buildings{
-         "marblemine", "oremine", "deep_oremine", 
+         "marblemine", "oremine", "deep_oremine", "deep_marblemine",
          "coalmine", "deep_coalmine", "burners_house"
       }
-      local mm = #rv.marblemine
+      local mm = #rv.marblemine + #rv.deep_marblemine
       local ore = #rv.oremine + #rv.deep_oremine
       local coal = #rv.coalmine + #rv.deep_coalmine + #rv.burners_house