Merge lp://staging/~meitis/widelands/bug861761 into lp://staging/widelands

Proposed by meitis
Status: Merged
Merged at revision: 7554
Proposed branch: lp://staging/~meitis/widelands/bug861761
Merge into: lp://staging/widelands
Diff against target: 184 lines (+78/-18)
2 files modified
src/economy/economy.cc (+77/-17)
src/wui/transport_ui.cc (+1/-1)
To merge this branch: bzr merge lp://staging/~meitis/widelands/bug861761
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+271710@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
wl-zocker (wl-zocker) wrote :

A short comment on your todo: If you have the sleep command after produce (and thus after consume), this would cause the productivity of buildings with missing wares to drop very fast. This is some unwanted behavior I fixed some time ago (https://code.launchpad.net/~wl-zocker/widelands/bug571796/+merge/225387)

Revision history for this message
GunChleoc (gunchleoc) wrote :

Tested and LGTM. Sorry it took me so long.

Just one code convention thing: could you please rename planAtLeastOne to plan_at_least_one?

In light if w-zocker's comment, I think you can also remove the TODO comment. I have also noticed another case of behaviour that's not wanted, but that problem is also present in trunk, so no need to fix it in this branch: If there is no warehouse to store the ware (warehouse policy set to "do not store") and no other building requests it, the ware is still produced, leading to a stock pile in front of the metal works.

Maybe we should open a new bug for the 2 issues?

Revision history for this message
meitis (meitis) wrote :

will fix the camelCase (sorry, I'm just so used to it, I overlooked this one. Usually I catch myself after typing the camelCase and then replace it the Cish style) and remove the TODO this evening or so

Revision history for this message
meitis (meitis) wrote :

sorry it took so long, as discussed, variable name fixed, comment removed.

please review

Revision history for this message
GunChleoc (gunchleoc) wrote :

Thanks!

I have created bug reports for the issues mentioned in this discussion.

https://bugs.launchpad.net/widelands/+bug/1505290

https://bugs.launchpad.net/widelands/+bug/1505291

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: