From 9f2c616e8e7ff11cb3c20aadd71ed429ee88f0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Fri, 31 Oct 2014 23:02:33 +0100 Subject: StateCommon: accept touch on OFFMAP Hex, but do not highlight them --- core/src/ch/asynk/tankontank/game/states/StateCommon.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/states/StateCommon.java b/core/src/ch/asynk/tankontank/game/states/StateCommon.java index 9c229b2..abcaae7 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateCommon.java +++ b/core/src/ch/asynk/tankontank/game/states/StateCommon.java @@ -76,15 +76,13 @@ public abstract class StateCommon implements State public boolean downInMap(float x, float y) { downHex = map.getHexAt(x, y); - if (downHex == null) return false; - return !downHex.isOffMap(); + return (downHex != null); } public boolean upInMap(float x, float y) { upHex = map.getHexAt(x, y); - if (upHex == null) return false; - return !upHex.isOffMap(); + return (upHex != null); } protected boolean hasUnit() @@ -96,7 +94,7 @@ public abstract class StateCommon implements State { selectedHex = hex; selectedUnit = selectedHex.getUnit(); - map.selectHex(selectedHex); + if (!hex.isOffMap()) map.selectHex(selectedHex); if (selectedUnit != null) isEnemy = ctrl.player.isEnemy(selectedUnit); else -- cgit v1.1-2-g2b99