[Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1643284 into lp:widelands
Continuous integration builds have changed state: Travis build 1962. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/202801837. Appveyor build 1797. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_bug_1643284-1797. -- https://code.launchpad.net/~widelands-dev/widelands/bug-1643284/+merge/317689 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1643284 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-1643284 into lp:widelands
TiborB has proposed merging lp:~widelands-dev/widelands/bug-1643284 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1643284 in widelands: "ships of a fleet can have the same name"
https://bugs.launchpad.net/widelands/+bug/1643284
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1643284/+merge/317689
Simple fix - it removes default shipnames when game is loaded. Saved
remaining_shipnames only should be used.
--
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug-1643284 into lp:widelands.
=== modified file 'src/logic/player.cc'
--- src/logic/player.cc 2017-02-15 01:56:35 +
+++ src/logic/player.cc 2017-02-17 22:01:12 +
@@ -1221,6 +1221,8 @@
* \param fr source stream
*/
void Player::read_remaining_shipnames(FileRead& fr) {
+ // First get rid of default shipnames
+ remaining_shipnames_.clear();
const uint16_t count = fr.unsigned_16();
for (uint16_t i = 0; i < count; ++i) {
remaining_shipnames_.insert(fr.string());
___
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-1658489-epedition-tab into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1658489-epedition-tab into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1658489-epedition-tab/+merge/317047 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1658489-epedition-tab. ___ 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/disambiguate_production_program_names into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/disambiguate_production_program_names into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/disambiguate_production_program_names/+merge/316933 -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/disambiguate_production_program_names 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/disambiguate_production_program_names into lp:widelands
@bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/disambiguate_production_program_names/+merge/316933 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/disambiguate_production_program_names 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-1658489-epedition-tab into lp:widelands
Review: Approve Yes. Thanks for the fix and the cleanup :) @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1658489-epedition-tab/+merge/317047 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1658489-epedition-tab. ___ 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-1658489-epedition-tab into lp:widelands
Review: Resubmit Can this go in now? I am vaction now and would like to start some other things... -- https://code.launchpad.net/~widelands-dev/widelands/bug-1658489-epedition-tab/+merge/317047 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1658489-epedition-tab. ___ 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
