From 0b57bfb1840d0020634c413ef6d4a0f2d88ced99 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Mon, 19 Jan 2015 12:24:25 +0100 Subject: PossiblePaths: add boolean canExit(Orientation o) --- core/src/ch/asynk/tankontank/game/states/StateMove.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'core/src/ch/asynk/tankontank/game') diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java index 7f2767b9..b3888623 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateMove.java +++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java @@ -184,12 +184,8 @@ public class StateMove extends StateCommon Zone exitZone = ctrl.battle.getExitZone(unit); if ((exitZone == null) || !exitZone.contains(hex)) return false; - if (map.possiblePaths.size() == 1) { - // TODO pathCost called with applayToPawn from Board it updates Pawn.move - int left = (unit.getMovementPoints() - map.possiblePaths.pathCost(0)); - if (left < 1) + if (!map.possiblePaths.canExit(exitZone.orientation)) return false; - } ctrl.setState(StateType.ESCAPE); return true; } -- cgit v1.2.3