From 38573f8b055e10497b75356cbee35fd7df75e90f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 20 Jan 2015 09:45:08 +0100 Subject: Ctrl: block EndOfTurn except in SELECT state --- core/src/ch/asynk/tankontank/game/Ctrl.java | 1 + core/src/ch/asynk/tankontank/game/states/StateDeployment.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index 82ba7f1..79008f4 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/tankontank/game/Ctrl.java @@ -202,6 +202,7 @@ public class Ctrl implements Disposable if (stateType == StateType.ANIMATION) { this.blockMap = hud.dialogActive(); } + hud.playerInfo.blockEndOfTurn(stateType == StateType.SELECT); this.state.leave(nextState); diff --git a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java index 6129631..3fd9aa5 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java +++ b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java @@ -26,7 +26,6 @@ public class StateDeployment extends StateCommon selectedUnit = null; ctrl.hud.actionButtons.hide(); ctrl.hud.playerInfo.unitDock.show(); - ctrl.hud.playerInfo.blockEndOfTurn(true); } @Override @@ -38,7 +37,6 @@ public class StateDeployment extends StateCommon if (entryZone != null) entryZone.enable(Hex.AREA, false); ctrl.hud.playerInfo.unitDock.hide(); - ctrl.hud.playerInfo.blockEndOfTurn(false); } @Override -- cgit v1.1-2-g2b99