diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-07 13:09:18 +0100 | 
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2015-12-07 13:09:18 +0100 | 
| commit | 2e5814992288aea9358ca940a678dbf22d2e7fc6 (patch) | |
| tree | 08e1fae68913435e88e9af1ee1f726ee492a81e1 /core | |
| parent | 08bc68c2da6f683b0fa4dd04c022b9b5b2bae83c (diff) | |
| download | RustAndDust-2e5814992288aea9358ca940a678dbf22d2e7fc6.zip RustAndDust-2e5814992288aea9358ca940a678dbf22d2e7fc6.tar.gz | |
get rid of orientation HexOverlay
Diffstat (limited to 'core')
4 files changed, 1 insertions, 8 deletions
| diff --git a/core/src/ch/asynk/rustanddust/game/Hex.java b/core/src/ch/asynk/rustanddust/game/Hex.java index e6cab3f..76d224f 100644 --- a/core/src/ch/asynk/rustanddust/game/Hex.java +++ b/core/src/ch/asynk/rustanddust/game/Hex.java @@ -29,12 +29,11 @@ public class Hex extends Tile      public static final int AREA        = 2;      public static final int MOVE        = 3;      public static final int DIRECTIONS  = 4; -    public static final int ORIENTATION = 5; +    public static final int EXIT        = 5;      public static final int OBJECTIVE       = 6;      public static final int OBJECTIVE_HOLD  = 7;      public static final int OBJECTIVE_GE    = 8;      public static final int OBJECTIVE_US    = 9; -    public static final int EXIT        = 10;      public Terrain terrain;      public int roads; diff --git a/core/src/ch/asynk/rustanddust/game/Map.java b/core/src/ch/asynk/rustanddust/game/Map.java index 5ce653e..def903f 100644 --- a/core/src/ch/asynk/rustanddust/game/Map.java +++ b/core/src/ch/asynk/rustanddust/game/Map.java @@ -614,8 +614,6 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS      public void hideMove(Hex hex)       { enableOverlayOn(hex, Hex.MOVE, false); }      public void showDirections(Hex hex) { enableOverlayOn(hex, Hex.DIRECTIONS, true); }      public void hideDirections(Hex hex) { enableOverlayOn(hex, Hex.DIRECTIONS, false); } -    public void showOrientation(Hex hex, Orientation o) { enableOverlayOn(hex, Hex.ORIENTATION, o, true); } -    public void hideOrientation(Hex hex) { enableOverlayOn(hex, Hex.ORIENTATION, false); }      public void showExit(Hex hex)       { enableOverlayOn(hex, Hex.EXIT, true); }      public void hideExit(Hex hex)       { enableOverlayOn(hex, Hex.EXIT, false); } diff --git a/core/src/ch/asynk/rustanddust/game/states/StateBreak.java b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java index f1e40f6..89a9224 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateBreak.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java @@ -25,7 +25,6 @@ public class StateBreak extends StateCommon          map.hideBreakUnits();          map.hideMove(to);          map.hideDirections(to); -        map.hideOrientation(to);          if (activeUnit != null) map.hideMove(activeUnit.getHex());      } @@ -66,7 +65,6 @@ public class StateBreak extends StateCommon              if (ctrl.cfg.mustValidate) {                  map.hideDirections(to); -                map.showOrientation(to, o);                  ctrl.hud.actionButtons.show(Buttons.DONE.b);              } else {                  doRotation(o); diff --git a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java index 4d91740..5a10471 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java @@ -44,7 +44,6 @@ public class StateRotate extends StateCommon          map.unselectHex(activeUnit.getHex());          map.hidePath(to);          map.hideDirections(to); -        map.hideOrientation(to);          map.pathBuilder.clear();          to = null;      } @@ -101,7 +100,6 @@ public class StateRotate extends StateCommon          if (ctrl.cfg.mustValidate) {              map.hideDirections(to); -            map.showOrientation(to, o);              ctrl.hud.actionButtons.show(Buttons.DONE.b | ((ctrl.cfg.canCancel) ? Buttons.ABORT.b : 0));          } else {              execute(); | 
