From 0c56e7f556277cf9518d0fb191539125e2e6adbf Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Fri, 31 Oct 2014 14:07:39 +0100 Subject: use new PossiblePaths class --- core/src/ch/asynk/tankontank/game/states/StateMove.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'core/src/ch/asynk/tankontank/game/states') diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java index bce5bafe..89d75353 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateMove.java +++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java @@ -9,7 +9,6 @@ public class StateMove extends StateCommon @Override public void enter(boolean fromSelect) { - map.possiblePaths.clear(); boolean moreThanOne = ((map.moveablePawns.size() + map.activatedPawns.size()) > 1); ctrl.hud.show(false, true, true, false, moreThanOne, ctrl.cfg.canCancel); ctrl.hud.moveBtn.setOn(); @@ -70,7 +69,7 @@ public class StateMove extends StateCommon } else if ((s == 0) && map.possibleMoves.contains(upHex)) { s = collectPaths(); } else if (map.possiblePaths.contains(upHex)) { - s = togglePoint(s); + s = togglePoint(downHex, s); } if (s == 1) { @@ -127,16 +126,16 @@ public class StateMove extends StateCommon return s; } - private int togglePoint(int s) + private int togglePoint(Hex hex, int s) { - if (downHex == activeUnit.getHex()) { + if (hex == activeUnit.getHex()) { // - } else if (downHex == to) { + } else if (hex == to) { // } else { map.hidePossiblePaths(); - map.togglePathOverlay(downHex); - s = map.possiblePathsPointToggle(downHex); + map.togglePathOverlay(hex); + s = map.togglePossiblePathHex(hex); map.showPossiblePaths(); } -- cgit v1.2.3