widelands-dev team mailing list archive

[TiborB <tiborb95@xxxxxxxxx>]

It looks good to me, just look at small question in diff

Diff comments:

> 
> === modified file 'src/editor/tools/editor_set_resources_tool.cc'
> --- src/editor/tools/editor_set_resources_tool.cc	2016-01-14 22:09:24 +0000
> +++ src/editor/tools/editor_set_resources_tool.cc	2016-03-16 21:48:13 +0000
> @@ -47,8 +47,12 @@
>  			amount = max_amount;
>  
>  		if (map->is_resource_valid(world, mr.location(), args->cur_res)) {

Could we also test that amount to be set differs from amount on the field now?, I mean:

... &&  mr.location().field->get_resources_amount() != amount) {

> -			args->orgResT.push_back(mr.location().field->get_resources());
> -			args->orgRes.push_back(mr.location().field->get_resources_amount());
> +			args->orgRes.push_back(EditorActionArgs::ResourceState{
> +				mr.location(),
> +				mr.location().field->get_resources(),
> +				mr.location().field->get_resources_amount()
> +			});
> +
>  			map->initialize_resources(mr.location(), args->cur_res, amount);
>  		}
>  	} while (mr.advance(*map));


-- 
https://code.launchpad.net/~widelands-dev/widelands/improve-restool/+merge/289305
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/improve-restool into lp:widelands.