summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust
diff options
context:
space:
mode:
Diffstat (limited to 'core/src/ch/asynk/rustanddust')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Ctrl.java7
1 files 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();