From d89a62531607c05cdb011635710a78b8e59c7a79 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Wed, 21 Jan 2015 23:25:45 +0100 Subject: StateMove: coding style --- core/src/ch/asynk/tankontank/game/Map.java | 5 ----- core/src/ch/asynk/tankontank/game/states/StateMove.java | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'core/src/ch/asynk/tankontank') diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index a7568195..390b5172 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -370,11 +370,6 @@ public abstract class Map extends Board implements MoveToAnimationCb, ObjectiveS public int exitBoard(Unit unit) { - // if (unit.justEntered()) { - // objectives.revert(); - // unit.reset(); - // } - return process(unit, pathBuilder.getExitMove()); } diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java index f81035d9..cce19a6c 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateMove.java +++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java @@ -101,7 +101,7 @@ public class StateMove extends StateCommon public void touchUp() { if (upHex == activeUnit.getHex()) { - if (to !=null) + if (to != null) map.hidePath(to); to = null; map.pathBuilder.clear(); @@ -123,7 +123,7 @@ public class StateMove extends StateCommon } if (s == 1) { - if (!checkExit(activeUnit, to)) + if (!checkExit(activeUnit, upHex)) ctrl.setState(StateType.ROTATE); } } @@ -149,8 +149,8 @@ public class StateMove extends StateCommon map.showPossibleMoves(); map.selectHex(hex); activeUnit.enableOverlay(Unit.MOVE, false); - checkExit(activeUnit, hex); ctrl.hud.notify(activeUnit.toString()); + checkExit(activeUnit, hex); } private int collectPaths(Hex hex) -- cgit v1.2.3