From 83eef7eeb4487083f67a9e6a30c8881354c18b3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 19 Nov 2014 14:18:09 +0100 Subject: Hud: differenciate END_TURN end ABORT_TURN --- core/src/ch/asynk/tankontank/game/Hud.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/Hud.java b/core/src/ch/asynk/tankontank/game/Hud.java index 0c503bf..929fc87 100644 --- a/core/src/ch/asynk/tankontank/game/Hud.java +++ b/core/src/ch/asynk/tankontank/game/Hud.java @@ -38,6 +38,7 @@ public class Hud implements Disposable enum DialogAction { EXIT_BOARD, + ABORT_TURN, END_TURN, END_DEPLOYMENT, END_GAME @@ -171,7 +172,11 @@ public class Hud implements Disposable break; case END_TURN: if (ok) - ctrl.abortPlayerTurn(); + ctrl.endPlayerTurn(false); + break; + case ABORT_TURN: + if (ok) + ctrl.endPlayerTurn(true); break; case END_DEPLOYMENT: if (ok) @@ -203,7 +208,7 @@ public class Hud implements Disposable public void askEndOfTurn() { ctrl.blockMap = true; - dialogAction = DialogAction.END_TURN; + dialogAction = DialogAction.ABORT_TURN; okCancel.show("You still have Action Points left.\nEnd your Turn anyway ?", Position.MIDDLE_CENTER); } -- cgit v1.1-2-g2b99