From 7983c8ba5954bd2b6461e69d866b37694810c918 Mon Sep 17 00:00:00 2001
From: Jérémy Zurcher <jeremy@asynk.ch>
Date: Thu, 9 Oct 2014 14:16:13 +0200
Subject: GameConfig: add and use canCancel, mustValidate

---
 core/src/ch/asynk/tankontank/game/GameCtrl.java               | 4 ++++
 core/src/ch/asynk/tankontank/game/states/GameStateMove.java   | 2 +-
 core/src/ch/asynk/tankontank/game/states/GameStateRotate.java | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'core/src/ch/asynk/tankontank/game')

diff --git a/core/src/ch/asynk/tankontank/game/GameCtrl.java b/core/src/ch/asynk/tankontank/game/GameCtrl.java
index 7951f801..76f79ab5 100644
--- a/core/src/ch/asynk/tankontank/game/GameCtrl.java
+++ b/core/src/ch/asynk/tankontank/game/GameCtrl.java
@@ -18,12 +18,16 @@ public class GameCtrl implements Disposable
         public boolean showMoves;
         public boolean showTargets;
         public boolean showMoveAssists;
+        public boolean canCancel;
+        public boolean mustValidate;
 
         public Config()
         {
             this.showMoves = true;
             this.showTargets = true;
             this.showMoveAssists = true;
+            this.mustValidate = false;
+            this.canCancel = true;
         }
     }
 
diff --git a/core/src/ch/asynk/tankontank/game/states/GameStateMove.java b/core/src/ch/asynk/tankontank/game/states/GameStateMove.java
index 110e3c63..1331adca 100644
--- a/core/src/ch/asynk/tankontank/game/states/GameStateMove.java
+++ b/core/src/ch/asynk/tankontank/game/states/GameStateMove.java
@@ -7,7 +7,7 @@ public class GameStateMove extends GameStateCommon
     {
         map.clearPossiblePaths();
         buildAndShowMoves();
-        ctrl.hud.show(false, true, false, true, true);
+        ctrl.hud.show(false, true, false, ctrl.cfg.mustValidate, ctrl.cfg.canCancel);
     }
 
     @Override
diff --git a/core/src/ch/asynk/tankontank/game/states/GameStateRotate.java b/core/src/ch/asynk/tankontank/game/states/GameStateRotate.java
index 7a200d2b..75167adc 100644
--- a/core/src/ch/asynk/tankontank/game/states/GameStateRotate.java
+++ b/core/src/ch/asynk/tankontank/game/states/GameStateRotate.java
@@ -8,7 +8,7 @@ public class GameStateRotate extends GameStateCommon
     public void enter()
     {
         map.showDirections(hex, true);
-        ctrl.hud.show(true, false, false, true, true);
+        ctrl.hud.show(true, false, false, ctrl.cfg.mustValidate, ctrl.cfg.canCancel);
     }
 
     @Override
-- 
cgit v1.2.3