widelands-dev team mailing list archive

[kaputtnik <somal@xxxxxxxx>]

kaputtnik has proposed merging lp:~widelands-dev/widelands/bug-1738641_set_resource into lp:widelands.

Commit message:
Remove comparison of amounts when using SetResource

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1738641 in widelands: "Resources can be replaced only once in editor"
  https://bugs.launchpad.net/widelands/+bug/1738641

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1738641_set_resource/+merge/335343

Remove the comparison of amounts when using SetResource. This will fix bug 1738641.


-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1738641_set_resource into lp:widelands.

=== modified file 'src/editor/tools/set_resources_tool.cc'
--- src/editor/tools/set_resources_tool.cc	2017-09-15 19:18:08 +0000
+++ src/editor/tools/set_resources_tool.cc	2017-12-18 20:19:29 +0000
@@ -45,8 +45,7 @@
 		if (amount > max_amount)
 			amount = max_amount;
 
-		if (map->is_resource_valid(world, mr.location(), args->current_resource) &&
-		    mr.location().field->get_resources_amount() != amount) {
+		if (map->is_resource_valid(world, mr.location(), args->current_resource)) {
 
 			args->original_resource.push_back(
 			   EditorActionArgs::ResourceState{mr.location(), mr.location().field->get_resources(),