From 0e85fe19af33870fa9ecede68e7291544c6acb37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 6 Oct 2014 17:19:47 +0200 Subject: GameStateRotate: use current selectet pawn if one --- core/src/ch/asynk/tankontank/game/states/GameStateMove.java | 1 + core/src/ch/asynk/tankontank/game/states/GameStateRotate.java | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/core/src/ch/asynk/tankontank/game/states/GameStateMove.java b/core/src/ch/asynk/tankontank/game/states/GameStateMove.java index 2e05e89..f99dc75 100644 --- a/core/src/ch/asynk/tankontank/game/states/GameStateMove.java +++ b/core/src/ch/asynk/tankontank/game/states/GameStateMove.java @@ -14,6 +14,7 @@ public class GameStateMove extends GameStateCommon map.enablePossibleTargets(false); map.enablePossiblePaths(false, false); if (pawn != null) { + // FIXME must be one of it's own skipFirst = false; map.clearPossiblePaths(); map.buildAndShowPossibleMoves(pawn, hex); diff --git a/core/src/ch/asynk/tankontank/game/states/GameStateRotate.java b/core/src/ch/asynk/tankontank/game/states/GameStateRotate.java index 0a24b35..14fd2a8 100644 --- a/core/src/ch/asynk/tankontank/game/states/GameStateRotate.java +++ b/core/src/ch/asynk/tankontank/game/states/GameStateRotate.java @@ -5,12 +5,21 @@ import ch.asynk.tankontank.engine.Orientation; public class GameStateRotate extends GameStateCommon { @Override + public void enter() + { + map.hidePossibles(); + if (pawn != null) { + // FIXME must be one of it's own + map.enableDirections(hex, true); + } + } + + @Override public void touchDown() { if (pawn == null) { super.touchDown(); if (hexHasUnit()) { - // TODO maybe keep the the previous hex // FIXME must be one of it's own setPawn(); map.enableDirections(hex, true); -- cgit v1.1-2-g2b99