diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2016-03-26 00:25:51 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2016-03-26 00:25:51 +0100 |
| commit | 2aeeefe00c1484e2a84d9764b6d1ff6d87f884cd (patch) | |
| tree | 3fd08309912666d9c266e9dba6f184b8c26d902f /core/src/ch/asynk/rustanddust/game/states | |
| parent | e7e81d1cc854e81e648fa9129dbd4dd5f58c3c32 (diff) | |
| download | RustAndDust-2aeeefe00c1484e2a84d9764b6d1ff6d87f884cd.zip RustAndDust-2aeeefe00c1484e2a84d9764b6d1ff6d87f884cd.tar.gz | |
Map4Rotate: methods called by States returns boolean
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/states')
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateRotate.java | 7 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java index acd2539..a2a8af7 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 ad67a83..f21fbed 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; } } |