From 0b3f7e947212d7efc7690870b2ea06295c9b4ecd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Tue, 30 Sep 2014 19:21:26 +0200
Subject: Map: fix touchUp

---
 core/src/ch/asynk/tankontank/game/Map.java | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index a66962e..363033d 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -47,6 +47,7 @@ public abstract class Map extends Board
     {
         if (currentHex.x != -1)
             enableOverlayOn(currentHex.x, currentHex.y, Hex.BLUE, false);
+
         getHexAt(currentHex, x, y);
         if (currentHex.x != -1) {
             enableOverlayOn(currentHex.x, currentHex.y, Hex.BLUE, true);
@@ -63,15 +64,18 @@ public abstract class Map extends Board
     {
         if (currentHex.x != -1)
             enableOverlayOn(currentHex.x, currentHex.y, Hex.BLUE, false);
+
         getHexAt(currentHex, x, y);
-        if (currentPawn != null) {
-            enableOverlayOn(currentHex.x, currentHex.y, Hex.BLUE, true);
-            pawnsToDraw.remove(currentPawn);
-            if (currentHex.x != -1) {
-                movePawnTo(currentPawn, currentHex);
-                showPossibleActions(currentPawn);
-            } else {
-                resetPawnMoves(currentPawn);
+        if (currentHex.x == -1) {
+            resetPawnMoves(currentPawn);
+        } else {
+            if (currentPawn != null) {
+                enableOverlayOn(currentHex.x, currentHex.y, Hex.BLUE, true);
+                pawnsToDraw.remove(currentPawn);
+                if (currentHex.x != -1) {
+                    movePawnTo(currentPawn, currentHex);
+                    showPossibleActions(currentPawn);
+                }
             }
         }
     }
-- 
cgit v1.1-2-g2b99