widelands-dev team mailing list archive

[SirVer <SirVer@xxxxxx>]

SirVer has proposed merging lp:~widelands-dev/widelands/fix_partial_plan_execution into lp:widelands.

Commit message:
Movement plans were sometimes not completely executed.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1656619 in widelands: "Problems with smooth Scrolling and screen resolution"
  https://bugs.launchpad.net/widelands/+bug/1656619

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fix_partial_plan_execution/+merge/315278

This hopefully should fix the attached bug.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/fix_partial_plan_execution into lp:widelands.

=== modified file 'src/wui/mapview.cc'
--- src/wui/mapview.cc	2017-01-16 07:51:12 +0000
+++ src/wui/mapview.cc	2017-01-20 21:36:53 +0000
@@ -350,6 +350,7 @@
 			plan.pop_front();
 		}
 		if (plan.size() == 1) {
+			set_view(plan[0].view, Transition::Jump);
 			view_plans_.pop_front();
 			continue;
 		}
@@ -370,6 +371,7 @@
 			plan.pop_front();
 		}
 		if (plan.size() == 1) {
+			mouse_to_pixel(round(plan[0].pixel), Transition::Jump);
 			mouse_plans_.pop_front();
 			continue;
 		}