summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-01-21 22:40:02 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-01-21 22:40:02 +0100
commitf734dd5230921f1e42a8c102c8974f49e0803935 (patch)
tree8935fb2b58066d6f32ff7a5b30fc8c4d45f3aa32 /core/src/ch/asynk
parent1e8464bcdd4b5a5fd554402fecd30f1cebee57cf (diff)
downloadRustAndDust-f734dd5230921f1e42a8c102c8974f49e0803935.zip
RustAndDust-f734dd5230921f1e42a8c102c8974f49e0803935.tar.gz
StateExit -> StateWithdraw
Diffstat (limited to 'core/src/ch/asynk')
-rw-r--r--core/src/ch/asynk/tankontank/game/Ctrl.java10
-rw-r--r--core/src/ch/asynk/tankontank/game/State.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateMove.java6
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateWithdraw.java (renamed from core/src/ch/asynk/tankontank/game/states/StateExit.java)2
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)