diff options
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/Ctrl.java')
-rw-r--r-- | core/src/ch/asynk/rustanddust/game/Ctrl.java | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java index 7b96ae5..6a6dad5 100644 --- a/core/src/ch/asynk/rustanddust/game/Ctrl.java +++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java @@ -146,11 +146,6 @@ public abstract class Ctrl implements Disposable stateAfterAnimation = after; } - public void unitDeployed() - { - battle.actionDone(); - } - // Hud callbacks public void endGame() @@ -166,7 +161,7 @@ public abstract class Ctrl implements Disposable public void endDeployment() { - setState(StateType.DONE); + this.state.execute(); turnDone(); } @@ -244,8 +239,10 @@ public abstract class Ctrl implements Disposable private StateType completeDeployment() { + if (battle.isDeploymentDone()) + hud.askEndDeployment(); battle.actionDone(); - return this.state.execute(); + return StateType.DEPLOYMENT; } private StateType abortAction() |