Merge lp://staging/~widelands-dev/widelands/bug1212191_bug1212192 into lp://staging/widelands
Proposed by
cghislai
| Status: | Merged | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 6721 | ||||||||
| Proposed branch: | lp://staging/~widelands-dev/widelands/bug1212191_bug1212192 | ||||||||
| Merge into: | lp://staging/widelands | ||||||||
| Diff against target: |
64 lines (+13/-12) 2 files modified
src/logic/production_program.cc (+8/-3) src/logic/worker.cc (+5/-9) |
||||||||
| To merge this branch: | bzr merge lp://staging/~widelands-dev/widelands/bug1212191_bug1212192 | ||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Nasenbaer | Approve | ||
|
Review via email:
|
|||
Description of the change
These are small fixes for the attached bugs.
As the worker evict logic changed a bit, i put it for review.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good and works fine for me :).
Further it made a yet (at least for me) unknown bug visible - the sleep program changed the statistics of the trainingssites, therefore the statistics where quickly rising up to 100% as soon as no soldiers were left inside a trainingssite.
I added the fix for that bug to the commit containing the branch merge.
Thank you very much for the two bug fixes :)!