Merge lp://staging/~widelands-dev/widelands/bug-1800571-flag-add-ware into lp://staging/widelands
Proposed by
Notabilis
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Merge reported by: | GunChleoc | ||||
| Merged at revision: | not available | ||||
| Proposed branch: | lp://staging/~widelands-dev/widelands/bug-1800571-flag-add-ware | ||||
| Merge into: | lp://staging/widelands | ||||
| To merge this branch: | bzr merge lp://staging/~widelands-dev/widelands/bug-1800571-flag-add-ware | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| GunChleoc | Approve | ||
|
Review via email:
|
|||
Commit message
Undoing "optimization" that is part of previous commit in r8903.
Description of the change
Commit r8903 moved some code within carrier.cc to avoid a duplicated call of a method in the Flag class. Unfortunately I overlooked that the call is no simple getter but modifies the internal state of the Flag, so it has to happen at the old code position.
Now doing the call to the method potentially twice, but it doesn't really matters performance-wise anyway.
For reference the old, buggy commit:
https:/
To post a comment you must log in.
Revision history for this message
| Notabilis (notabilis27) wrote | # |
Revision history for this message
| bunnybot (widelandsofficial) wrote | # |
Revision history for this message
| GunChleoc (gunchleoc) wrote | # |
I guess Launchpad doesn't like me since it doesn't want to show the diff here (again). And yes, I waited for the branch to be parsed after pushing it. :/
Anyway, here are the changes:
https:/