diff options
Diffstat (limited to 'core/src/ch/asynk/tankontank')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Ctrl.java | 8 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/states/StateExit.java (renamed from core/src/ch/asynk/tankontank/game/states/StateEscape.java) | 4 | 
2 files changed, 5 insertions, 7 deletions
| diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index 0a1c416..4ca116f 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.StateEscape; +import ch.asynk.tankontank.game.states.StateExit;  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 escapeState; +    private State exitState;      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.escapeState = new StateEscape(); +        this.exitState = new StateExit();          this.state = selectState;          this.stateType = StateType.DONE; @@ -230,7 +230,7 @@ public class Ctrl implements Disposable                  this.state = breakState;                  break;              case ESCAPE: -                this.state = escapeState; +                this.state = exitState;                  break;              case ANIMATION:                  this.blockMap = true; diff --git a/core/src/ch/asynk/tankontank/game/states/StateEscape.java b/core/src/ch/asynk/tankontank/game/states/StateExit.java index 98bedd9..f1dadba 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateEscape.java +++ b/core/src/ch/asynk/tankontank/game/states/StateExit.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 StateEscape extends StateCommon +public class StateExit extends StateCommon  {      @Override      public void enter(StateType prevState) @@ -46,8 +46,6 @@ public class StateEscape extends StateCommon      private StateType escape(Unit unit)      { -        // ctrl.hud.notify("Escape " + unit); -          Zone exitZone = ctrl.battle.getExitZone(unit);          Hex hex = unit.getHex(); | 
