summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-16 01:44:07 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-16 01:44:07 +0100
commit375b1da1637c9eaf2c84d4cdc6db5670567fed33 (patch)
tree99bd0f13d4474030f3dad2c52824016e2b395644 /core
parentd9d3996c248ab65818b5a93622d1d2b021bf9a02 (diff)
downloadRustAndDust-375b1da1637c9eaf2c84d4cdc6db5670567fed33.zip
RustAndDust-375b1da1637c9eaf2c84d4cdc6db5670567fed33.tar.gz
StateDeployment,Ctrl: add done button
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/tankontank/game/Ctrl.java5
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateDeployment.java1
2 files changed, 6 insertions, 0 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index dbe8817..4067806 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -154,6 +154,11 @@ public class Ctrl implements Disposable
{
StateType nextState = this.state.done();
+ if (stateType == StateType.DEPLOYMENT) {
+ switchPlayer();
+ return nextState;
+ }
+
if (nextState == StateType.DONE) {
if (map.activatedPawns.size() > 0) {
TankOnTank.debug("burn down 1AP");
diff --git a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
index 222ea67..299fdfa 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
@@ -131,6 +131,7 @@ public class StateDeployment extends StateCommon
selectedUnit = null;
if (ctrl.checkDeploymentDone()) {
done = true;
+ ctrl.hud.actionButtons.show(Buttons.DONE.b);
}
}
}