widelands-dev team mailing list archive

[Notabilis <notabilis27@xxxxxx>]

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.