From dfe77e1532120e1e98ea4e7467c6e570362b30c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sun, 16 Nov 2014 00:00:09 +0100 Subject: Ctrl: code reorder --- core/src/ch/asynk/tankontank/game/Ctrl.java | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index acc92dd..4c13791 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/tankontank/game/Ctrl.java @@ -167,20 +167,6 @@ public class Ctrl implements Disposable return nextState; } - public void stateTouchUp() - { - this.state.touchUp(); - } - - - public void reinforcementHit() - { - if (this.stateType == StateType.SELECT) - setState(StateType.REINFORCEMENT); - else if (this.stateType == StateType.REINFORCEMENT) - setState(StateType.SELECT); - } - public void setState(StateType nextState) { if (nextState == StateType.ABORT) @@ -246,6 +232,20 @@ public class Ctrl implements Disposable state.touchUp(); } + public void stateTouchUp() + { + this.state.touchUp(); + } + + + public void reinforcementHit() + { + if (this.stateType == StateType.SELECT) + setState(StateType.REINFORCEMENT); + else if (this.stateType == StateType.REINFORCEMENT) + setState(StateType.SELECT); + } + public void setAfterAnimationState(StateType after) { stateAfterAnimation = after; -- cgit v1.1-2-g2b99