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;