From 9f9cbe67653a6bfa0ba3e9b00b9a3d4317f086b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Mon, 13 Oct 2014 17:24:00 +0200 Subject: Unit: fix isHq() -> add UnitType.HARD_TARGET_HQ --- core/src/ch/asynk/tankontank/game/Unit.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/src/ch/asynk/tankontank/game/Unit.java b/core/src/ch/asynk/tankontank/game/Unit.java index f6c6c1a..d9ac448 100644 --- a/core/src/ch/asynk/tankontank/game/Unit.java +++ b/core/src/ch/asynk/tankontank/game/Unit.java @@ -15,6 +15,7 @@ public class Unit extends HeadedPawn enum UnitType { HARD_TARGET, + HARD_TARGET_HQ, INFANTRY, AT_GUN } @@ -23,7 +24,6 @@ public class Unit extends HeadedPawn public int def; public int cdef; public int mp; - public boolean hq; public UnitType type; public Army army; private boolean hasMoved; @@ -39,7 +39,6 @@ public class Unit extends HeadedPawn { super(atlas, unit, head); this.army = army; - this.hq = hq; this.rng = range; this.def = defense; this.mp = movementPoints; @@ -53,7 +52,6 @@ public class Unit extends HeadedPawn { super(atlas, unit, head); this.army = army; - this.hq = hq; this.rng = range; this.def = defense; this.cdef = concealedDefense; @@ -103,7 +101,7 @@ public class Unit extends HeadedPawn @Override public boolean isHq() { - return hq; + return (type == UnitType.HARD_TARGET_HQ); } @Override -- cgit v1.1-2-g2b99