diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2016-05-20 05:18:04 +0200 | 
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2016-05-20 05:18:04 +0200 | 
| commit | e947029d39b6bcc7f17d1dfc4c1d3adce3d15c5d (patch) | |
| tree | 2919bcd132cdbd0d18e5a354d7f667ed04591c3e /core | |
| parent | b8822b195222203a713e73aa70bffde0f844406a (diff) | |
| download | RustAndDust-e947029d39b6bcc7f17d1dfc4c1d3adce3d15c5d.zip RustAndDust-e947029d39b6bcc7f17d1dfc4c1d3adce3d15c5d.tar.gz  | |
Ctrl: checkPlayer first check if deployment is done
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/Ctrl.java | 7 | 
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();  | 
