diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-01-21 22:40:02 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-01-21 22:40:02 +0100 |
| commit | f734dd5230921f1e42a8c102c8974f49e0803935 (patch) | |
| tree | 8935fb2b58066d6f32ff7a5b30fc8c4d45f3aa32 /core/src/ch/asynk/tankontank/game/states | |
| parent | 1e8464bcdd4b5a5fd554402fecd30f1cebee57cf (diff) | |
| download | RustAndDust-f734dd5230921f1e42a8c102c8974f49e0803935.zip RustAndDust-f734dd5230921f1e42a8c102c8974f49e0803935.tar.gz | |
StateExit -> StateWithdraw
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/states')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/states/StateMove.java | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/states/StateWithdraw.java (renamed from core/src/ch/asynk/tankontank/game/states/StateExit.java) | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java index 27bc6af..f81035d 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateMove.java +++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java @@ -14,7 +14,7 @@ public class StateMove extends StateCommon ((map.activatedUnits.size() > 0) ? Buttons.DONE.b : 0) | (ctrl.cfg.canCancel ? Buttons.ABORT.b : 0)); - if (prevState == StateType.ESCAPE) { + if (prevState == StateType.WITHDRAW) { if (map.pathBuilder.size() == 1) ctrl.setState(StateType.ROTATE); return; @@ -49,7 +49,7 @@ public class StateMove extends StateCommon @Override public void leave(StateType nextState) { - if (nextState == StateType.ESCAPE) + if (nextState == StateType.WITHDRAW) return; // hide all but assists : want them when in rotation @@ -188,7 +188,7 @@ public class StateMove extends StateCommon return false; if ((unit.getHex() != hex) && !map.pathBuilder.canExit(exitZone.orientation)) return false; - ctrl.setState(StateType.ESCAPE); + ctrl.setState(StateType.WITHDRAW); return true; } } diff --git a/core/src/ch/asynk/tankontank/game/states/StateExit.java b/core/src/ch/asynk/tankontank/game/states/StateWithdraw.java index f8edf03..20ba80d 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateExit.java +++ b/core/src/ch/asynk/tankontank/game/states/StateWithdraw.java @@ -4,7 +4,7 @@ import ch.asynk.tankontank.game.Zone; import ch.asynk.tankontank.game.Hex; import ch.asynk.tankontank.game.Unit; -public class StateExit extends StateCommon +public class StateWithdraw extends StateCommon { @Override public void enter(StateType prevState) |