summaryrefslogtreecommitdiffstats
path: root/core/src
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-09 22:39:19 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-09 22:39:19 +0100
commitbe8c714f2f8404ad2c951e78e211146cfe64d933 (patch)
tree4ba08f08d59e2f088640ea451fce5f6e11b6998a /core/src
parentc3c85d9dc88b26b20dae3d1fc37bee2c4e06721e (diff)
downloadRustAndDust-be8c714f2f8404ad2c951e78e211146cfe64d933.zip
RustAndDust-be8c714f2f8404ad2c951e78e211146cfe64d933.tar.gz
Ctrl: code reorder
Diffstat (limited to 'core/src')
-rw-r--r--core/src/ch/asynk/rustanddust/game/Ctrl.java56
1 files changed, 28 insertions, 28 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/Ctrl.java b/core/src/ch/asynk/rustanddust/game/Ctrl.java
index 383417b..8896101 100644
--- a/core/src/ch/asynk/rustanddust/game/Ctrl.java
+++ b/core/src/ch/asynk/rustanddust/game/Ctrl.java
@@ -153,6 +153,34 @@ public class Ctrl implements Disposable
}
}
+ public void endDeployment()
+ {
+ setState(StateType.DONE);
+ turnDone();
+ }
+
+ public void endGame()
+ {
+ game.switchToMenu();
+ }
+
+ public void endPlayerTurn(boolean abort)
+ {
+ if (abort)
+ state.abort();
+ turnDone();
+ }
+
+ public void exitBoard(boolean doit)
+ {
+ if (doit)
+ setState(StateType.DONE);
+ else
+ setState(StateType.ABORT);
+ }
+
+ //
+
private void turnDone()
{
if (battle.turnDone())
@@ -276,32 +304,4 @@ public class Ctrl implements Disposable
else if (this.stateType == StateType.REINFORCEMENT)
setState(StateType.SELECT);
}
-
- // Hud callbacks
-
- public void endDeployment()
- {
- setState(StateType.DONE);
- turnDone();
- }
-
- public void endGame()
- {
- game.switchToMenu();
- }
-
- public void endPlayerTurn(boolean abort)
- {
- if (abort)
- state.abort();
- turnDone();
- }
-
- public void exitBoard(boolean doit)
- {
- if (doit)
- setState(StateType.DONE);
- else
- setState(StateType.ABORT);
- }
}