diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-31 14:07:39 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-10-31 14:07:39 +0100 |
commit | 0c56e7f556277cf9518d0fb191539125e2e6adbf (patch) | |
tree | d4f18b3deb000994b9992ab95bc4029afd83a9e4 /core/src/ch/asynk/tankontank/game/states | |
parent | 8ccb332b71aee3f16b354d015485780698580220 (diff) | |
download | RustAndDust-0c56e7f556277cf9518d0fb191539125e2e6adbf.zip RustAndDust-0c56e7f556277cf9518d0fb191539125e2e6adbf.tar.gz |
use new PossiblePaths class
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/states')
-rw-r--r-- | core/src/ch/asynk/tankontank/game/states/StateMove.java | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java index bce5baf..89d7535 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(); } |