From 38c948d7285cb449624510383f75fc0b8521c52d Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Fri, 19 Dec 2014 10:06:17 +0100
Subject: Ctrl,StateDeployment: ask for end deployment, if so call turnDone()
 after setState(DONE)

---
 core/src/ch/asynk/tankontank/game/Ctrl.java                   | 2 +-
 core/src/ch/asynk/tankontank/game/states/StateDeployment.java | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'core/src/ch/asynk/tankontank/game')

diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java
index e8b6fd7c..b150cd98 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 2cc77435..baa15ca5 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);
-        }
     }
 }
-- 
cgit v1.2.3