From e947029d39b6bcc7f17d1dfc4c1d3adce3d15c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Fri, 20 May 2016 05:18:04 +0200
Subject: Ctrl: checkPlayer first check if deployment is done

---
 core/src/ch/asynk/rustanddust/game/Ctrl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java
index 422e8eb..62f7412 100644
--- a/core/src/ch/asynk/rustanddust/game/Ctrl.java
+++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java
@@ -502,11 +502,14 @@ public abstract class Ctrl implements Disposable
 
     private void checkPlayer(StateType nextState, boolean notify)
     {
-        if (battle.getPlayer().apExhausted()) {
+        Player p = battle.getPlayer();
+        if (!p.isDeploymentDone()) {
+            post(nextState);
+        } else if (p.apExhausted()) {
             if (notify)
                 hud.notify("No more Action Points", Position.MIDDLE_CENTER);
             postTurnDone();
-        } else if (!battle.getPlayer().canDoSomething()) {
+        } else if (!p.canDoSomething()) {
             if (notify)
                 hud.notify("No available Actions", Position.MIDDLE_CENTER);
             postTurnDone();
-- 
cgit v1.1-2-g2b99