diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-15 17:13:40 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-15 17:13:40 +0100 |
commit | 7c632e6e19c32fb8eff0464b5d5ea1a775c26358 (patch) | |
tree | 60201b7a74f2b01b4a66c8c9aaaa227637940c00 /core | |
parent | 3ba6db44f7fb0f3511e7a55be1dc732a5d4d9b20 (diff) | |
download | RustAndDust-7c632e6e19c32fb8eff0464b5d5ea1a775c26358.zip RustAndDust-7c632e6e19c32fb8eff0464b5d5ea1a775c26358.tar.gz |
Ctrl: add setAfterAnimationState(StateType)
Diffstat (limited to 'core')
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Ctrl.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index f430846..203bed9 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/tankontank/game/Ctrl.java @@ -185,17 +185,10 @@ public class Ctrl implements Disposable public void setState(StateType nextState) { - setState(nextState, battle.getState(player)); - } - - public void setState(StateType nextState, StateType whenDone) - { if (nextState == StateType.ABORT) nextState = actionAborted(); else if (nextState == StateType.DONE) nextState = actionDone(); - else if (nextState == StateType.ANIMATION) - stateAfterAnimation = whenDone; this.state.leave(nextState); @@ -255,6 +248,11 @@ public class Ctrl implements Disposable state.touchUp(); } + public void setAfterAnimationState(StateType after) + { + stateAfterAnimation = after; + } + public void endGame() { game.setScreen(new OptionsScreen(game)); |