Merge lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands

[Notabilis]

Undoing "optimization" that is part of previous commit in r8903.

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://bazaar.launchpad.net/~widelands-dev/widelands/bug-1797213-idle-wares-at-flags-carrier/revision/8903

[Notabilis (notabilis27)]

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://bazaar.launchpad.net/~widelands-dev/widelands/bug-1800571-flag-add-ware/revision/8904/src/logic/map_objects/tribes/carrier.cc

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 4180. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/448498521.
Appveyor build 3978. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1800571_flag_add_ware-3978.

[GunChleoc (gunchleoc)]

Thanks, let's have it!

@bunnybot merge

review: Approve

[GunChleoc (gunchleoc)]

Merged in r8904 - Launchpad hiccup