summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-30 01:16:54 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-30 01:16:54 +0100
commit94e5b7b1a8a3449b04bb9b5abe5224d70cc8712e (patch)
treeaa9124b23b95d26943f32d9b603a891604c2a19a /core
parentf24fb0260857f07f62fbe0a432009f7827b1b7eb (diff)
downloadRustAndDust-94e5b7b1a8a3449b04bb9b5abe5224d70cc8712e.zip
RustAndDust-94e5b7b1a8a3449b04bb9b5abe5224d70cc8712e.tar.gz
StateDeployment: replace deployment end dialog with OK button
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/tankontank/game/Ctrl.java4
-rw-r--r--core/src/ch/asynk/tankontank/game/states/StateDeployment.java4
2 files changed, 5 insertions, 3 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index 0c9ad63..341292b 100644
--- a/core/src/ch/asynk/tankontank/game/Ctrl.java
+++ b/core/src/ch/asynk/tankontank/game/Ctrl.java
@@ -282,8 +282,8 @@ public class Ctrl implements Disposable
public boolean checkDeploymentDone()
{
boolean done = battle.deploymentDone(player);
- if (done)
- hud.askEndDeployment();
+ // if (done)
+ // hud.askEndDeployment();
return done;
}
diff --git a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
index e8e20ae..b2359cd 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateDeployment.java
@@ -129,7 +129,9 @@ public class StateDeployment extends StateCommon
entryZone = null;
activeUnit = null;
selectedUnit = null;
- if (ctrl.checkDeploymentDone())
+ if (ctrl.checkDeploymentDone()) {
done = true;
+ ctrl.hud.actionButtons.show(Buttons.DONE.b);
+ }
}
}