From 2aeeefe00c1484e2a84d9764b6d1ff6d87f884cd Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Sat, 26 Mar 2016 00:25:51 +0100
Subject: Map4Rotate: methods called by States returns boolean

---
 core/src/ch/asynk/rustanddust/game/states/StateRotate.java   | 7 +++++--
 core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'core/src/ch/asynk/rustanddust/game/states')

diff --git a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
index acd2539b..a2a8af71 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java
@@ -71,8 +71,11 @@ public class StateRotate extends StateCommon
 
         StateType whenDone = StateType.DONE;
 
-        if (map.moveUnit(activeUnit) > 0)
-            whenDone = StateType.MOVE;
+        if (map.moveUnit(activeUnit)) {
+            if (map.unitsActivableSize() > 0)
+                whenDone = StateType.MOVE;
+        } else
+            RustAndDust.debug("rotate failed");
 
         ctrl.setAfterAnimationState(whenDone);
         return StateType.ANIMATION;
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java b/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java
index ad67a83e..f21fbed9 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java
@@ -54,8 +54,11 @@ public class StateWithdraw extends StateCommon
         map.movesHide();
         map.hexUnselect(hex);
 
-        if (map.exitBoard(unit) > 0)
-            return StateType.MOVE;
+        if (map.exitBoard(unit)) {
+            if (map.unitsActivableSize() > 0)
+                return StateType.MOVE;
+        } else
+            RustAndDust.debug("exit failed");
         return StateType.DONE;
     }
 }
-- 
cgit v1.2.3