diff options
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Ctrl.java | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index 4067806..6889342 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(); |