From e60b3d647b9eff905977fd9f5a7760ce0b0113ea Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Sun, 18 Jan 2015 22:06:22 +0100 Subject: remove Pawn.Movement class, use Move instead --- core/src/ch/asynk/tankontank/game/states/StateMove.java | 2 +- core/src/ch/asynk/tankontank/game/states/StateRotate.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'core/src/ch/asynk/tankontank/game/states') diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java index 7ab8be88..0ed1b2a7 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 2e1e8229..2b455129 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; -- cgit v1.2.3