diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-01-18 22:06:22 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-01-18 22:06:22 +0100 |
| commit | e60b3d647b9eff905977fd9f5a7760ce0b0113ea (patch) | |
| tree | 2a2be7fd724f3534cfeb818ebffa275f7e90c55f /core/src/ch/asynk/tankontank/game/states | |
| parent | 28ebacf54e013690337a754522616ca909a440f5 (diff) | |
| download | RustAndDust-e60b3d647b9eff905977fd9f5a7760ce0b0113ea.zip RustAndDust-e60b3d647b9eff905977fd9f5a7760ce0b0113ea.tar.gz | |
remove Pawn.Movement class, use Move instead
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/states')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/states/StateMove.java | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/states/StateRotate.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java index 7ab8be8..0ed1b2a 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateMove.java +++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java @@ -69,7 +69,7 @@ public class StateMove extends StateCommon public StateType abort() { hideAssists(); - if (activeUnit.movement.entryMove) { + if (activeUnit.justEntered()) { map.leaveBoard(activeUnit); ctrl.player.revertUnitEntry(activeUnit); return StateType.ABORT; diff --git a/core/src/ch/asynk/tankontank/game/states/StateRotate.java b/core/src/ch/asynk/tankontank/game/states/StateRotate.java index 2e1e822..2b45512 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateRotate.java +++ b/core/src/ch/asynk/tankontank/game/states/StateRotate.java @@ -54,7 +54,7 @@ public class StateRotate extends StateCommon { StateType nextState = StateType.ABORT; ctrl.hud.actionButtons.hide(); - if (activeUnit.movement.entryMove) { + if (activeUnit.justEntered()) { map.leaveBoard(activeUnit); ctrl.player.revertUnitEntry(activeUnit); nextState = StateType.ABORT; @@ -95,7 +95,7 @@ public class StateRotate extends StateCommon return; } - if (!activeUnit.movement.entryMove && rotateOnly && (o == activeUnit.getOrientation())) + if (!activeUnit.justEntered() && rotateOnly && (o == activeUnit.getOrientation())) return; map.possiblePaths.orientation = o; |