diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-16 00:00:09 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-16 00:00:09 +0100 |
commit | dfe77e1532120e1e98ea4e7467c6e570362b30c2 (patch) | |
tree | 830673b87001aa74ecee2f0ff12055cfd8c7d15c | |
parent | f150e03ee334fd403f31eb9f94de71b375224f9a (diff) | |
download | RustAndDust-dfe77e1532120e1e98ea4e7467c6e570362b30c2.zip RustAndDust-dfe77e1532120e1e98ea4e7467c6e570362b30c2.tar.gz |
Ctrl: code reorder
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Ctrl.java | 28 |
1 files 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; |