Fix bug #21372: fix unit move continuation if enemy discovered

wesnoth · May 4, 2014 · 784edee · 784edee
1 parent 0a8158c
commit 784edee
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/changelog b/changelog
@@ -10,6 +10,7 @@ Version 1.11.13+dev:
      unsigned long rather than an unsigned int.
    * Fix bug #21491: fix drag+drop for unit movements
    * Fix bug #21448: make premoved units selection like in Wesnoth 1.10
+   * Fix bug #21372: fix unit move continuation if enemy discovered
 
 Version 1.11.13:
  * AI:

diff --git a/players_changelog b/players_changelog
@@ -8,6 +8,7 @@ Version 1.11.13+dev:
  * Miscellaneous and bug fixes:
    * Fix bug stopping drag+drop for unit movements
    * Revert premoved units selection to Wesnoth 1.10 behavior (#21448)
+   * Fix unit move continuation if enemy discovered (#21372)
 
 
 Version 1.11.13:

diff --git a/src/mouse_events.cpp b/src/mouse_events.cpp
@@ -676,10 +676,7 @@ void mouse_handler::move_action(bool browse)
 
 void mouse_handler::select_hex(const map_location& hex, const bool browse, const bool highlight, const bool fire_event) {
 
-	if (selected_hex_ == hex)
-		selected_hex_ = map_location::null_location;
-	else
-		selected_hex_ = hex;
+	selected_hex_ = hex;
 
 	gui().select_hex(selected_hex_);
 	gui().clear_attack_indicator();