diff options
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game')
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/map/Map2Moves.java | 2 | ||||
| -rw-r--r-- | core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/map/Map2Moves.java b/core/src/ch/asynk/rustanddust/game/map/Map2Moves.java index 411e2c9..738de2b 100644 --- a/core/src/ch/asynk/rustanddust/game/map/Map2Moves.java +++ b/core/src/ch/asynk/rustanddust/game/map/Map2Moves.java @@ -72,10 +72,10 @@ public abstract class Map2Moves extends Map1Units public void pathsSetOrientation(Orientation o) { paths.orientation = o; } public boolean pathsIsSet() { return paths.isSet(); } public boolean pathsCanExit(Orientation o) { return paths.canExit(o); } - public void pathsSetExit(Orientation o) { paths.setExit(o); } public boolean pathsContains(Hex hex) { return paths.contains(hex); } public int pathsChooseBest() { return paths.chooseBest(); } public int pathsChooseShortest() { return paths.chooseShortest(); } + public int pathsChooseExit(Orientation o) { return paths.chooseExit(o); } public int pathsToggleHex(Hex hex) { boolean enable = !hex.isOverlayEnabled(Hex.MOVE); diff --git a/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java b/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java index a759e51..12bb3c4 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java @@ -43,14 +43,12 @@ public class StateWithdraw extends StateCommon if (map.pathsTo() == null) map.pathsBuild(hex); - if (map.pathsSize() > 1) - RustAndDust.debug("ERROR: Withdraw pathsSize() == " + map.pathsSize()); - Hex exitHex = (Hex) map.pathsTo(); if (!exitZone.contains(exitHex)) throw new RuntimeException(String.format("%s not in exitZone", exitHex)); - map.pathsSetExit(exitZone.orientation); + if (map.pathsChooseExit(exitZone.orientation) > 1) + RustAndDust.debug("ERROR: Withdraw pathsSize() == " + map.pathsSize()); unit.hideActiveable(); if (to != null) |