From c0e21f1e5d0a791b30aff89ac0401b4dad5ca881 Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Wed, 3 Dec 2014 11:43:42 +0100
Subject: StateRotate: any touch out of adjacents aborts the action

---
 core/src/ch/asynk/tankontank/game/states/StateRotate.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'core')

diff --git a/core/src/ch/asynk/tankontank/game/states/StateRotate.java b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
index f15b3604..f67982e4 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateRotate.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateRotate.java
@@ -82,16 +82,14 @@ public class StateRotate extends StateCommon
     @Override
     public void touchUp()
     {
-        if (upHex == activeUnit.getHex()) {
-            ctrl.setState(StateType.ABORT);
-            return;
-        }
-
         if (rotationSet) return;
 
         o = Orientation.fromAdj(to, upHex);
+        if (o == Orientation.KEEP) {
+            ctrl.setState(StateType.ABORT);
+            return;
+        }
 
-        if (o == Orientation.KEEP) return;
         if (!activeUnit.movement.entryMove && rotateOnly && (o == activeUnit.getOrientation())) return;
         rotationSet = true;
 
-- 
cgit v1.2.3