Merge lp://staging/~widelands-dev/widelands/bug-1823467-trainingsites-dependencies into lp://staging/widelands
Proposed by
GunChleoc
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merged at revision: | 9038 | ||||
| Proposed branch: | lp://staging/~widelands-dev/widelands/bug-1823467-trainingsites-dependencies | ||||
| Merge into: | lp://staging/widelands | ||||
| Diff against target: |
302 lines (+92/-45) 5 files modified
data/tribes/scripting/help/building_help.lua (+13/-14) data/tribes/scripting/help/ware_help.lua (+2/-2) src/scripting/lua_map.cc (+43/-15) src/scripting/lua_map.h (+2/-2) test/maps/lua_testsuite.wmf/scripting/immovables_descriptions.lua (+32/-12) |
||||
| To merge this branch: | bzr merge lp://staging/~widelands-dev/widelands/bug-1823467-trainingsites-dependencies | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| hessenfarmer | test and review | Approve | |
|
Review via email:
|
|||
Commit message
Filter wares' producers and consumers for the tribe in the Lua interface.
Description of the change
Stop Frisian building from showing up in Barbarian help and vice versa.
This could also have been solved by 2 extra "if" statements in Lua, but I decided to go the C++ route to make the code safer against future bugs.
To post a comment you must log in.
Revision history for this message
| bunnybot (widelandsofficial) wrote | # |
Revision history for this message
| hessenfarmer (stephan-lutz) wrote | # |
review:
Approve
(test and review)
Revision history for this message
| GunChleoc (gunchleoc) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Continuous integration builds have changed state:
Travis build 4675. State: passed. Details: https:/
Appveyor build 4461. State: success. Details: https:/