From 3684b17fb5a8c3ccf725526f446ee90cd94a3406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 28 Oct 2014 16:12:10 +0100 Subject: Map: add 'Hex getHexAt(float x, float y)' --- core/src/ch/asynk/tankontank/game/Map.java | 5 +++++ core/src/ch/asynk/tankontank/game/states/StateCommon.java | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 8310788..cdf46ce 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -85,6 +85,11 @@ public abstract class Map extends Board activatedPawns.clear(); } + public Hex getHexAt(float x, float y) + { + return (Hex) getTileAt(x, y); + } + public Hex getHex(int col, int row) { return (Hex) getTile(col, row); diff --git a/core/src/ch/asynk/tankontank/game/states/StateCommon.java b/core/src/ch/asynk/tankontank/game/states/StateCommon.java index 0ff9ba1..91f0609 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateCommon.java +++ b/core/src/ch/asynk/tankontank/game/states/StateCommon.java @@ -77,16 +77,14 @@ public abstract class StateCommon implements State public boolean downInMap(float x, float y) { - // FIXME - downHex = (Hex) map.getTileAt(x, y); + downHex = map.getHexAt(x, y); if (downHex == null) return false; return !downHex.isOffMap(); } public boolean upInMap(float x, float y) { - // FIXME - upHex = (Hex) map.getTileAt(x, y); + upHex = map.getHexAt(x, y); if (upHex == null) return false; return !upHex.isOffMap(); } -- cgit v1.1-2-g2b99