From a6cab36024b954d4aaf260d0c0ac24ab7044f8f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 10 Nov 2014 11:53:05 +0100 Subject: Pawn,Unit: fix the way the Unit is marked has moved --- core/src/ch/asynk/tankontank/engine/Pawn.java | 5 +++++ core/src/ch/asynk/tankontank/game/Unit.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/src/ch/asynk/tankontank/engine/Pawn.java b/core/src/ch/asynk/tankontank/engine/Pawn.java index b81f8c2..c10d3e7 100644 --- a/core/src/ch/asynk/tankontank/engine/Pawn.java +++ b/core/src/ch/asynk/tankontank/engine/Pawn.java @@ -84,6 +84,11 @@ public abstract class Pawn implements Moveable, Disposable entryMove = false; orientation = Orientation.KEEP; } + + public boolean isComplete() + { + return ((from != null) && (to != null)); + } } private static final float MOVE_TIME = 0.4f; diff --git a/core/src/ch/asynk/tankontank/game/Unit.java b/core/src/ch/asynk/tankontank/game/Unit.java index 3e5052e..e97ff2f 100644 --- a/core/src/ch/asynk/tankontank/game/Unit.java +++ b/core/src/ch/asynk/tankontank/game/Unit.java @@ -205,7 +205,7 @@ public class Unit extends HeadedPawn TankOnTank.debug(move.toString()); if (move.cost > mpLeft) TankOnTank.debug("ERROR: Movement point exceeded: " + move.cost + "/" + mpLeft + " please report"); - if (!move.entryMove) { + if (move.isComplete()) { hasMoved = true; } mpLeft -= move.cost; -- cgit v1.1-2-g2b99