summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2016-02-17 17:18:05 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2016-02-17 17:18:05 +0100
commitc92e902364a3e7549f61ba5a29bf9c9fca429305 (patch)
tree61503b85ae9d188d06af0c13a9ec6463505f7659 /core
parentb2b6ad08ef4dec9d3bb19d048f00fa2b12e3bdb6 (diff)
downloadRustAndDust-c92e902364a3e7549f61ba5a29bf9c9fca429305.zip
RustAndDust-c92e902364a3e7549f61ba5a29bf9c9fca429305.tar.gz
StateDeployment,Ctrl: call unitDeployed() { battle.actionDone(); } after each unit deployed
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Ctrl.java5
-rw-r--r--core/src/ch/asynk/rustanddust/game/states/StateDeployment.java2
2 files changed, 7 insertions, 0 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java
index 4bedf83..7b96ae5 100644
--- a/core/src/ch/asynk/rustanddust/game/Ctrl.java
+++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java
@@ -146,6 +146,11 @@ public abstract class Ctrl implements Disposable
stateAfterAnimation = after;
}
+ public void unitDeployed()
+ {
+ battle.actionDone();
+ }
+
// Hud callbacks
public void endGame()
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java
index 516c058..a209b87 100644
--- a/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java
+++ b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java
@@ -125,5 +125,7 @@ public class StateDeployment extends StateCommon
ctrl.hud.playerInfo.unitDock.show();
if (ctrl.battle.isDeploymentDone())
ctrl.hud.askEndDeployment();
+ else
+ ctrl.unitDeployed();
}
}