diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-12 16:58:58 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-12 16:58:58 +0100 |
commit | 7ddf67a0fc8530f5127f9c7d7cd49f09f4eeae7b (patch) | |
tree | 52fc7b1e58c0ad5e20b15df853d63657af789a20 /core/src/ch/asynk/tankontank | |
parent | 0457ab6e2494d3e4c9574a6df2c861e6804f3746 (diff) | |
download | RustAndDust-7ddf67a0fc8530f5127f9c7d7cd49f09f4eeae7b.zip RustAndDust-7ddf67a0fc8530f5127f9c7d7cd49f09f4eeae7b.tar.gz |
StateEntry -> StateReinforcement
Diffstat (limited to 'core/src/ch/asynk/tankontank')
-rw-r--r-- | core/src/ch/asynk/tankontank/game/Ctrl.java | 6 | ||||
-rw-r--r-- | core/src/ch/asynk/tankontank/game/State.java | 2 | ||||
-rw-r--r-- | core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java | 2 | ||||
-rw-r--r-- | core/src/ch/asynk/tankontank/game/states/StateReinforcement.java (renamed from core/src/ch/asynk/tankontank/game/states/StateEntry.java) | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index a3d1855..210e7e9 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/tankontank/game/Ctrl.java @@ -11,7 +11,7 @@ import ch.asynk.tankontank.game.states.StatePromote; import ch.asynk.tankontank.game.states.StateAttack; import ch.asynk.tankontank.game.states.StateBreak; import ch.asynk.tankontank.game.states.StateAnimation; -import ch.asynk.tankontank.game.states.StateEntry; +import ch.asynk.tankontank.game.states.StateReinforcement; import ch.asynk.tankontank.screens.OptionsScreen; @@ -61,7 +61,7 @@ public class Ctrl implements Disposable this.attackState = new StateAttack(); this.breakState = new StateBreak(); this.animationState = new StateAnimation(); - this.entryState = new StateEntry(); + this.entryState = new StateReinforcement(); this.state = selectState; this.stateType = State.StateType.SELECT; @@ -192,7 +192,7 @@ public class Ctrl implements Disposable case ANIMATION: this.state = animationState; break; - case ENTRY: + case REINFORCEMENT: this.state = entryState; break; default: diff --git a/core/src/ch/asynk/tankontank/game/State.java b/core/src/ch/asynk/tankontank/game/State.java index b6fe5e1..70cc08b 100644 --- a/core/src/ch/asynk/tankontank/game/State.java +++ b/core/src/ch/asynk/tankontank/game/State.java @@ -10,7 +10,7 @@ public interface State BREAK, PROMOTE, ANIMATION, - ENTRY, + REINFORCEMENT, ABORT, DONE }; diff --git a/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java b/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java index 1c93123..1cb54ef 100644 --- a/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java +++ b/core/src/ch/asynk/tankontank/game/hud/PlayerInfo.java @@ -142,7 +142,7 @@ public class PlayerInfo implements Disposable, Drawable } else if (hit == reinforcement) { if (reinforcement.hit(x, y)) - ctrl.toggleState(StateType.ENTRY, StateType.SELECT); + ctrl.toggleState(StateType.REINFORCEMENT, StateType.SELECT); } else if (hit == unitDock) { if (unitDock.hit(x, y)) diff --git a/core/src/ch/asynk/tankontank/game/states/StateEntry.java b/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java index cfdc24c..a66973e 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateEntry.java +++ b/core/src/ch/asynk/tankontank/game/states/StateReinforcement.java @@ -8,7 +8,7 @@ import ch.asynk.tankontank.game.Hex; import ch.asynk.tankontank.game.Unit; import ch.asynk.tankontank.game.hud.ActionButtons.Buttons; -public class StateEntry extends StateCommon +public class StateReinforcement extends StateCommon { private TileSet entryPoint; |