[Widelands-dev] [Merge] lp:~widelands-dev/widelands/json_writer into lp:widelands
Continuous integration builds have changed state: Travis build 4178. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/447958040. Appveyor build 3976. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_json_writer-3976. -- https://code.launchpad.net/~widelands-dev/widelands/json_writer/+merge/357908 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/json_writer 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/fix_immovabledescr_unpersist into lp:widelands
Continuous integration builds have changed state: Travis build 4177. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/447739050. Appveyor build 3975. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_fix_immovabledescr_unpersist-3975. -- https://code.launchpad.net/~widelands-dev/widelands/fix_immovabledescr_unpersist/+merge/357941 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_immovabledescr_unpersist 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/fix_immovabledescr_unpersist into lp:widelands
GunChleoc has proposed merging lp:~widelands-dev/widelands/fix_immovabledescr_unpersist into lp:widelands. Commit message: Fix unpersisting of LuaImmovableDescription for tribe immovables. Requested reviews: Widelands Developers (widelands-dev) For more details, see: https://code.launchpad.net/~widelands-dev/widelands/fix_immovabledescr_unpersist/+merge/357941 This bug does not seem to be triggered currently; I found it while looking at the code. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_immovabledescr_unpersist into lp:widelands. === modified file 'src/scripting/lua_map.cc' --- src/scripting/lua_map.cc 2018-10-27 09:45:14 + +++ src/scripting/lua_map.cc 2018-10-29 11:05:36 + @@ -1868,10 +1868,13 @@ UNPERS_STRING("name", name); const World& world = get_egbase(L).world(); DescriptionIndex idx = world.get_immovable_index(name); - if (idx == INVALID_INDEX) { - throw LuaError((boost::format("Immovable '%s' doesn't exist.") % name).str()); - } - set_description_pointer(world.get_immovable_descr(idx)); + if (idx != INVALID_INDEX) { +set_description_pointer(world.get_immovable_descr(idx)); +} else { +const Tribes& tribes = get_egbase(L).tribes(); +idx = tribes.safe_immovable_index(name); +set_description_pointer(tribes.get_immovable_descr(idx)); +} } /* RST ___ 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-1797213-idle-wares-at-flags-carrier into lp:widelands
The proposal to merge lp:~widelands-dev/widelands/bug-1797213-idle-wares-at-flags-carrier into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-1797213-idle-wares-at-flags-carrier/+merge/357920 -- Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1797213-idle-wares-at-flags-carrier. ___ 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-1797213-idle-wares-at-flags-carrier into lp:widelands
Review: Approve You're my hero! @bunnybot merge -- https://code.launchpad.net/~widelands-dev/widelands/bug-1797213-idle-wares-at-flags-carrier/+merge/357920 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/bug-1797213-idle-wares-at-flags-carrier. ___ 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