From e3fce2b2ec21cb787b21a8327bc71dd0127247e4 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Wed, 5 Nov 2014 17:21:42 +0100 Subject: StateMove,StateRotate: correctly revert entry moves --- core/src/ch/asynk/tankontank/game/states/StateMove.java | 4 ++++ core/src/ch/asynk/tankontank/game/states/StateRotate.java | 5 +++++ 2 files changed, 9 insertions(+) (limited to 'core/src/ch/asynk') diff --git a/core/src/ch/asynk/tankontank/game/states/StateMove.java b/core/src/ch/asynk/tankontank/game/states/StateMove.java index f96678ab..657c9bda 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateMove.java +++ b/core/src/ch/asynk/tankontank/game/states/StateMove.java @@ -83,6 +83,10 @@ public class StateMove extends StateCommon hideAssists(); ctrl.setAnimationCount(map.activatedPawns.size()); map.revertMoves(); + if (activeUnit.move.entryMove) { + map.leaveBoard(activeUnit); + ctrl.player.revertUnitEntry(activeUnit); + } super.abort(); } diff --git a/core/src/ch/asynk/tankontank/game/states/StateRotate.java b/core/src/ch/asynk/tankontank/game/states/StateRotate.java index 2b63535e..2a90eeba 100644 --- a/core/src/ch/asynk/tankontank/game/states/StateRotate.java +++ b/core/src/ch/asynk/tankontank/game/states/StateRotate.java @@ -71,6 +71,11 @@ public class StateRotate extends StateCommon public void abort() { ctrl.hud.hide(); + if (activeUnit.move.entryMove) { + map.leaveBoard(activeUnit); + ctrl.player.revertUnitEntry(activeUnit); + super.abort(); + } if (map.activatedPawns.size() == 0) { hideAssists(); super.abort(); -- cgit v1.2.3