Fix bug 22231: movement continuation in whiteboard.\n\nProblem was th…

…at the whiteboard was not initialized and the select or action function that is called with the hotkey for select/move/attack couldn't see the partial whiteboard movements.
wesnoth · Jun 28, 2014 · 23a3d15 · 23a3d15
1 parent 34126ca
commit 23a3d15
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/changelog b/changelog
@@ -214,6 +214,7 @@ Version 1.13.0-dev:
    * Fix bug #20126: Recursive preprocessor includes cause infinite loop
    * Added 'faction_lock' and 'leader_lock' to SideWML to be used in MP Connect
      screen. Fixes bug #21978.
+   * Fix bug #22231: partial moves now able to be continued in whiteboard
 
 Version 1.11.11:
  * Add-ons server:

diff --git a/players_changelog b/players_changelog
@@ -48,6 +48,7 @@ Version 1.13.0-dev:
    * Revert premoved units selection to Wesnoth 1.10 behavior (#21448)
    * Fix unit move continuation if enemy discovered (#21372)
    * Support for total conversions, so called "cores". 
+   * Partial moves now able to be continued properly in whiteboard (#22231)
 
 Version 1.11.11:
  * Campaigns:

diff --git a/src/mouse_events.cpp b/src/mouse_events.cpp
@@ -519,6 +519,9 @@ void mouse_handler::select_or_action(bool browse)
 	if (!resources::gameboard->map().on_board(last_hex_))
 		return;
 
+	// Load whiteboard partial moves
+	wb::future_map_if_active planned_unit_map;
+
 	unit_map::iterator clicked_u = find_unit(last_hex_);
 	unit_map::iterator selected_u = find_unit(selected_hex_);
 	if ( clicked_u != resources::units->end() &&