GameState: plugin StateType.ATTACK -> StateAttack() + quick fire, wait for the class

1 files changed, 13 insertions, 5 deletions

diff --git a/core/src/ch/asynk/tankontank/game/states/StateSelect.java b/core/src/ch/asynk/tankontank/game/states/StateSelect.java
index ec1ba42..c02c0c7 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateSelect.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateSelect.java
@@ -33,11 +33,19 @@ public class StateSelect extends StateCommon
     @Override
     public void touchUp()
     {
-        if (!isEnemy && map.isInPossibleMoves(upHex)) {
-            // quick move
-            to.set(upHex);
-            ctrl.setState(StateType.MOVE);
-            return;
+        if (!isEnemy) {
+            if (map.isInPossibleMoves(upHex)) {
+                // quick move
+                to.set(upHex);
+                ctrl.setState(StateType.MOVE);
+                return;
+            }
+            if (map.isInPossibleTargets(upHex)) {
+                // quick fire
+                to.set(upHex);
+                ctrl.setState(StateType.ATTACK);
+                return;
+            }
         }
 
         selectHexAndPawn(upHex);