widelands

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

  1. bar01_fix_reveal_campaign
  2. Merge into trunk
Proposed by kaputtnik
Status: Merged
Merged at revision: 8956
Proposed branch: lp:~widelands-dev/widelands/bar01_fix_reveal_campaign
Merge into: lp:widelands
Diff against target: 10 lines (+1/-1)
1 file modified
data/campaigns/bar01.wmf/scripting/mission_thread.lua (+1/-1)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bar01_fix_reveal_campaign
Reviewer Review Type Date Requested Status
hessenfarmer Approve
Review via email: mp+361480@code.launchpad.net

Commit message

Fixed reveal_campaign in bar_01

Description of the change

I guess this was a copy and paste error, introduced in https://code.launchpad.net/~widelands-dev/widelands/bug-1803602-reveal-frisian-campaign/+merge/358894

To post a comment you must log in.
Revision history for this message
bunnybot (widelandsofficial) wrote :

Continuous integration builds have changed state:

Travis build 4388. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/476741251.
Appveyor build 4179. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bar01_fix_reveal_campaign-4179.

Revision history for this message
hessenfarmer (stephan-lutz) wrote :

Good spot. Yes it seems to be a copy paste error.
@bunnybot merge

review: Approve
Revision history for this message
kaputtnik (franku) wrote :

Thanks :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'data/campaigns/bar01.wmf/scripting/mission_thread.lua'
2--- data/campaigns/bar01.wmf/scripting/mission_thread.lua 2018-11-19 08:09:41 +0000
3+++ data/campaigns/bar01.wmf/scripting/mission_thread.lua 2019-01-08 08:04:32 +0000
4@@ -328,7 +328,7 @@
5
6 message_box_objective(plr, msg_mission_complete)
7 plr:reveal_scenario("barbariantut01")
8- p1:reveal_campaign("campsect1")
9+ plr:reveal_campaign("campsect1")
10 end
11
12

Subscribers

People subscribed via source and target branches

to status/vote changes: