StateEscape: if exit from unit hex, build stay path, add runtime exitHex validation

1 files changed, 10 insertions, 5 deletions

diff --git a/core/src/ch/asynk/tankontank/game/states/StateEscape.java b/core/src/ch/asynk/tankontank/game/states/StateEscape.java
index 98e4a8b..2d8eefd 100644
--- a/core/src/ch/asynk/tankontank/game/states/StateEscape.java
+++ b/core/src/ch/asynk/tankontank/game/states/StateEscape.java
@@ -1,6 +1,7 @@
 package ch.asynk.tankontank.game.states;
 
 import ch.asynk.tankontank.game.Zone;
+import ch.asynk.tankontank.game.Hex;
 import ch.asynk.tankontank.game.Unit;
 
 public class StateEscape extends StateCommon
@@ -48,12 +49,16 @@ public class StateEscape extends StateCommon
         // ctrl.hud.notify("Escape " + unit);
 
         Zone exitZone = ctrl.battle.getExitZone(unit);
+        Hex hex = unit.getHex();
 
-        if (map.possiblePaths.size() == 1)
-            map.possiblePaths.setExit(exitZone.orientation);
-        else
-            map.possiblePaths.build(map.getAdjTileAt(unit.getTile(), exitZone.orientation));
-        map.possiblePaths.orientation = exitZone.orientation;
+        if (selectedHex == hex)
+            map.possiblePaths.build(hex);
+
+        Hex exitHex = (Hex) map.possiblePaths.to;
+        if (!exitZone.contains(exitHex))
+            throw new RuntimeException(String.format("%s not in exitZone", exitHex));
+
+        map.possiblePaths.setExit(exitZone.orientation);
 
         unit.hideMoveable();
         map.hidePath(to);