summaryrefslogtreecommitdiffstats
path: root/core/src/ch
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-01-20 09:45:08 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-01-20 09:45:08 +0100
commit38573f8b055e10497b75356cbee35fd7df75e90f (patch)
tree2d433b29508f6ef47ddab483744aa3ff5a928e14 /core/src/ch
parentae0e7d1c1c03eceeba145a47d96c87d87df32fc5 (diff)
downloadRustAndDust-38573f8.zip
RustAndDust-38573f8.tar.gz
Ctrl: block EndOfTurn except in SELECT state
Diffstat (limited to 'core/src/ch')
-rw-r--r--core/src/ch/asynk/tankontank/game/Ctrl.java1
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateDeployment.java2
2 files changed, 1 insertions, 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