[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1800571-flag-add-ware/+merge/358046 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1800571-flag-add-ware. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands
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. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1800571-flag-add-ware/+merge/358046 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands
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 -- https://code.launchpad.net/~widelands-dev/widelands/bug-1800571-flag-add-ware/+merge/358046 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands
Notabilis has proposed merging lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands. Commit message: Undoing "optimization" that is part of previous commit in r8903. Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #1800571 in widelands: "crash with r8903" https://bugs.launchpad.net/widelands/+bug/1800571 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1800571-flag-add-ware/+merge/358046 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 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1800571-flag-add-ware into lp:widelands. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
