diff options
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/states')
3 files changed, 6 insertions, 8 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/states/StateCommon.java b/core/src/ch/asynk/rustanddust/game/states/StateCommon.java index fdb797c..97aecfc 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateCommon.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateCommon.java @@ -55,7 +55,7 @@ public abstract class StateCommon implements State if (cfg.showMoves && unit.canMove()) map.movesShow(); if (cfg.showTargets && unit.canEngage()) map.unitsTargetShow(); if (cfg.showMoveAssists && unit.canMove()) map.unitsMoveableShow(); - unit.enableOverlay(Unit.MOVE, false); + unit.hideActiveable(); } protected void hidePossibilities() diff --git a/core/src/ch/asynk/rustanddust/game/states/StateMove.java b/core/src/ch/asynk/rustanddust/game/states/StateMove.java index d89ee44..8c3c68e 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateMove.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateMove.java @@ -26,7 +26,6 @@ public class StateMove extends StateCommon if (prevState == StateType.SELECT) { // use selectedHex and selectedUnit activeUnit = selectedUnit; - activeUnit.showMoveable(); map.pathsInit(activeUnit); map.collectUpdate(activeUnit); if (to != null) { @@ -44,7 +43,7 @@ public class StateMove extends StateCommon } } - activeUnit.enableOverlay(Unit.MOVE, false); + activeUnit.hideActiveable(); } @Override @@ -54,7 +53,7 @@ public class StateMove extends StateCommon return; // hide all but assists : want them when in rotation - activeUnit.hideMoveable(); + activeUnit.hideActiveable(); map.movesHide(); map.hexUnselect(activeUnit.getHex()); if (to != null) @@ -138,17 +137,16 @@ public class StateMove extends StateCommon if (activeUnit != null ) { map.hexUnselect(activeUnit.getHex()); if (activeUnit.canMove()) - activeUnit.enableOverlay(Unit.MOVE, true); + activeUnit.showActiveable(); } activeUnit = unit; + activeUnit.hideActiveable(); Hex hex = activeUnit.getHex(); map.pathsInit(activeUnit, hex); - activeUnit.showMoveable(); map.movesHide(); map.movesCollect(activeUnit); map.movesShow(); map.hexSelect(hex); - activeUnit.enableOverlay(Unit.MOVE, false); ctrl.hud.notify(activeUnit.toString(), Position.TOP_CENTER); checkExit(activeUnit, hex); } diff --git a/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java b/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java index ed4251e..a17f58b 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateWithdraw.java @@ -58,7 +58,7 @@ public class StateWithdraw extends StateCommon map.pathsSetExit(exitZone.orientation); - unit.hideMoveable(); + unit.hideActiveable(); if (to != null) map.pathHide(to); map.movesHide(); |