From c2126e98a99dd5aeddf45c02ef193d26279ddd7b Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Sun, 16 Nov 2014 12:55:36 +0100
Subject: Ctrl: code reorder

---
 core/src/ch/asynk/tankontank/game/Ctrl.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'core/src/ch/asynk/tankontank')

diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index 40678060..68893421 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -86,14 +86,14 @@ public class Ctrl implements Disposable
         map.dispose();
     }
 
-    public boolean mayProcessTouch()
+    public boolean isInAction()
     {
-        return (state != animationState);
+        return (state != selectState);
     }
 
-    public boolean isInAction()
+    public boolean mayProcessTouch()
     {
-        return (state != selectState);
+        return (state != animationState);
     }
 
     public void setAnimationCount(int count)
@@ -248,6 +248,11 @@ public class Ctrl implements Disposable
         this.state.touchUp();
     }
 
+    public void setAfterAnimationState(StateType after)
+    {
+        stateAfterAnimation = after;
+    }
+
     public boolean checkDeploymentDone()
     {
         boolean done = battle.deploymentDone(player);
@@ -264,11 +269,6 @@ public class Ctrl implements Disposable
             setState(StateType.SELECT);
     }
 
-    public void setAfterAnimationState(StateType after)
-    {
-        stateAfterAnimation = after;
-    }
-
     public void endDeployment()
     {
         state.done();
-- 
cgit v1.2.3