diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-16 12:55:36 +0100 | 
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-16 12:55:36 +0100 | 
| commit | c2126e98a99dd5aeddf45c02ef193d26279ddd7b (patch) | |
| tree | 49e39eff8655ac308ab9a2953aac73d171825a73 /core | |
| parent | 35c6e8e8617c261b51462c6d07d1fcad5c1b0504 (diff) | |
| download | RustAndDust-c2126e98a99dd5aeddf45c02ef193d26279ddd7b.zip RustAndDust-c2126e98a99dd5aeddf45c02ef193d26279ddd7b.tar.gz | |
Ctrl: code reorder
Diffstat (limited to 'core')
| -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(); | 
