Merge lp:~widelands-dev/widelands/use_correct_zoom into lp:widelands

[SirVer]

Use the target zoom instead of the current zoom when planning a moving animation.

[GunChleoc (gunchleoc)]

Code LGTM. Tested and this fixes the bug.

I am in favour of aborting the movement though as the bzr reporter suggested, and also of slowing down the movement. It is making me motion sick.

Let's wait for Travis then merge this one, because it's already an improvement.

review: Approve

[GunChleoc (gunchleoc)]

bzr reporter -> bug reporter *lol

[bunnybot (widelandsofficial)]

Continuous integration builds have changed state:

Travis build 1856. State: passed. Details: https://travis-ci.org/widelands/widelands/builds/194399423.
Appveyor build 1693. State: success. Details: https://ci.appveyor.com/project/widelands-dev/widelands/build/_widelands_dev_widelands_use_correct_zoom-1693.

[GunChleoc (gunchleoc)]

@bunnybot merge

=== modified file 'src/wui/mapview.cc'
--- src/wui/mapview.cc	2017-01-20 21:25:16 +0000
+++ src/wui/mapview.cc	2017-01-23 08:21:49 +0000
@@ -441,9 +441,10 @@
 }
 
 void MapView::scroll_to_map_pixel(const Vector2f& pos, const Transition& transition) {
-	const Rectf area = view_area().rect();
+	const TimestampedView current = animation_target_view();
+	const Rectf area = get_view_area(current.view, get_w(), get_h());
 	const Vector2f target_view = pos - Vector2f(area.w / 2.f, area.h / 2.f);
-	set_view(View{target_view, view_.zoom}, transition);
+	set_view(View{target_view, current.view.zoom}, transition);
 }
 
 MapView::ViewArea MapView::view_area() const {