StateExit -> StateWithdraw

4 files changed, 10 insertions, 10 deletions

diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index 4ca116f..09b5c5d 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -16,7 +16,7 @@ import ch.asynk.tankontank.game.states.StateBreak;
 import ch.asynk.tankontank.game.states.StateAnimation;
 import ch.asynk.tankontank.game.states.StateReinforcement;
 import ch.asynk.tankontank.game.states.StateDeployment;
-import ch.asynk.tankontank.game.states.StateExit;
+import ch.asynk.tankontank.game.states.StateWithdraw;
 
 public class Ctrl implements Disposable
 {
@@ -43,7 +43,7 @@ public class Ctrl implements Disposable
     private State animationState;
     private State reinforcementState;
     private State deploymentState;
-    private State exitState;
+    private State withdrawState;
 
     private int animationCount = 0;
 
@@ -74,7 +74,7 @@ public class Ctrl implements Disposable
         this.animationState = new StateAnimation();
         this.reinforcementState = new StateReinforcement();
         this.deploymentState = new StateDeployment();
-        this.exitState = new StateExit();
+        this.withdrawState = new StateWithdraw();
 
         this.state = selectState;
         this.stateType = StateType.DONE;
@@ -229,8 +229,8 @@ public class Ctrl implements Disposable
             case BREAK:
                 this.state = breakState;
                 break;
-            case ESCAPE:
-                this.state = exitState;
+            case WITHDRAW:
+                this.state = withdrawState;
                 break;
             case ANIMATION:
                 this.blockMap = true;
diff --git a/core/src/ch/asynk/tankontank/game/State.java b/core/src/ch/asynk/tankontank/game/State.java
index 76f5b99..efbf7f9 100644
--- a/core/src/ch/asynk/tankontank/game/State.java
+++ b/core/src/ch/asynk/tankontank/game/State.java
@@ -12,7 +12,7 @@ public interface State
         ANIMATION,
         REINFORCEMENT,
         DEPLOYMENT,
-        ESCAPE,
+        WITHDRAW,
         ABORT,
         DONE
     };
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)