diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-13 23:43:55 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-13 23:43:55 +0100 |
| commit | 40363ea5a2e5fbc96569bc97fce0ca207f05f0e3 (patch) | |
| tree | 70c4178fb3015fe7c4ef9e863b7a5f4ecdc6b7be /core/src | |
| parent | 07d5eb36f7bdfbdd0ca69881d2658b618135b917 (diff) | |
| download | RustAndDust-40363ea5a2e5fbc96569bc97fce0ca207f05f0e3.zip RustAndDust-40363ea5a2e5fbc96569bc97fce0ca207f05f0e3.tar.gz | |
Ctrl: endPlayerTurn() -> abortPlayerTurn()
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Ctrl.java | 6 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Hud.java | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Ctrl.java b/core/src/ch/asynk/tankontank/game/Ctrl.java index 8c54a72..4fe91f1 100644 --- a/core/src/ch/asynk/tankontank/game/Ctrl.java +++ b/core/src/ch/asynk/tankontank/game/Ctrl.java @@ -230,4 +230,10 @@ public class Ctrl implements Disposable { game.setScreen(new OptionsScreen(game)); } + + public void abortPlayerTurn() + { + state.abort(); + swicthPlayer(); + } } diff --git a/core/src/ch/asynk/tankontank/game/Hud.java b/core/src/ch/asynk/tankontank/game/Hud.java index f39a1e7..5b1ae3b 100644 --- a/core/src/ch/asynk/tankontank/game/Hud.java +++ b/core/src/ch/asynk/tankontank/game/Hud.java @@ -162,7 +162,7 @@ public class Hud implements Disposable { case END_TURN: if (okCancel.ok) - ctrl.endPlayerTurn(); + ctrl.abortPlayerTurn(); okCancel.visible = false; break; case END_GAME: |