TiborB has proposed merging lp:~widelands-dev/widelands/bug-977980 into lp:widelands.
Requested reviews: Widelands Developers (widelands-dev) Related bugs: Bug #977980 in widelands: "Fish and mountain ressources cannot be removed when they are on grass" https://bugs.launchpad.net/widelands/+bug/977980 For more details, see: https://code.launchpad.net/~widelands-dev/widelands/bug-977980/+merge/242410 This is bug fix - to allow decreasing amount of resources in editor, when resource does not match the terrain. -- Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-977980 into lp:widelands.
=== modified file 'src/editor/tools/editor_decrease_resources_tool.cc' --- src/editor/tools/editor_decrease_resources_tool.cc 2014-09-20 09:37:47 +0000 +++ src/editor/tools/editor_decrease_resources_tool.cc 2014-11-20 20:12:29 +0000 @@ -56,8 +56,7 @@ args.orgResT.push_back(res); args.orgRes.push_back(mr.location().field->get_resources_amount()); - if (res == args.cur_res && - editor_change_resource_tool_callback(mr.location(), map, world, args.cur_res)) { + if (res == args.cur_res) { // Ok, we're doing something. First remove the current overlays. std::string str = world.get_resource(res)->get_editor_pic
_______________________________________________ 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