summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-12-19 10:06:17 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-12-19 10:06:17 +0100
commit38c948d7285cb449624510383f75fc0b8521c52d (patch)
tree0587dbcc0c2056977154f5970bd34b9acd0e7633
parente6f762fd2914e9a3f8a88d2a04f6e0ab3b445556 (diff)
downloadRustAndDust-38c948d7285cb449624510383f75fc0b8521c52d.zip
RustAndDust-38c948d7285cb449624510383f75fc0b8521c52d.tar.gz
Ctrl,StateDeployment: ask for end deployment, if so call turnDone() after setState(DONE)
-rw-r--r--core/src/ch/asynk/tankontank/game/Ctrl.java2
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateDeployment.java4
2 files changed, 2 insertions, 4 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index e8b6fd7..b150cd9 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -180,7 +180,6 @@ public class Ctrl implements Disposable
private StateType deploymentDone()
{
- hud.notifyDeploymentDone();
return this.state.done();
}
@@ -302,6 +301,7 @@ public class Ctrl implements Disposable
public void endDeployment()
{
setState(StateType.DONE);
+ turnDone();
}
public void endGame()
diff --git a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
index 2cc7743..baa15ca 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
@@ -129,9 +129,7 @@ public class StateDeployment extends StateCommon
entryZone = null;
activeUnit = null;
selectedUnit = null;
- if (ctrl.checkDeploymentDone()) {
+ if (ctrl.checkDeploymentDone())
completed = true;
- ctrl.hud.actionButtons.show(Buttons.DONE.b);
- }
}
}