← Back to team overview

widelands-dev team mailing list archive

Re: [Merge] lp:~widelands-dev/widelands/pass_through_infos into lp:widelands

 

1 nit, rest LGTM.

Diff comments:

> === modified file 'src/editor/editorinteractive.cc'
> --- src/editor/editorinteractive.cc	2017-08-20 17:45:42 +0000
> +++ src/editor/editorinteractive.cc	2017-08-27 15:50:48 +0000
> @@ -308,14 +311,22 @@
>  	return InteractiveBase::handle_mousepress(btn, x, y);
>  }
>  
> +void EditorInteractive::draw(RenderTarget& dst) {
> +	const GameRenderer::Overlays overlays{get_text_to_draw(), {}};
> +	map_view()->draw_map_view(
> +	   egbase(), overlays,
> +	   draw_immovables_ ? GameRenderer::DrawImmovables::kYes : GameRenderer::DrawImmovables::kNo,
> +	   draw_bobs_ ? GameRenderer::DrawBobs::kYes : GameRenderer::DrawBobs::kNo, nullptr, &dst);
> +}
> +
>  /// Needed to get freehand painting tools (hold down mouse and move to edit).
>  void EditorInteractive::set_sel_pos(Widelands::NodeAndTriangle<> const sel) {
>  	bool const target_changed = tools_->current().operates_on_triangles() ?
> -	                               sel.triangle != get_sel_pos().triangle :
> -	                               sel.node != get_sel_pos().node;
> +	                               sel.triangle != sel.triangle :
> +	                               sel.node != sel.node;

Isn't this always false now?

>  	InteractiveBase::set_sel_pos(sel);
>  	if (target_changed && is_painting_)
> -		map_clicked(true);
> +		map_clicked(sel, true);
>  }
>  
>  void EditorInteractive::set_sel_radius_and_update_menu(uint32_t const val) {


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


References