From eb4228baba57a85bacf870ba3532ac7fc53520b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Tue, 2 Feb 2016 10:18:22 +0100 Subject: Map0Hex: add IterableArray objectives --- core/src/ch/asynk/rustanddust/game/map/Map0Hex.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java b/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java index aed7098..e40f58c 100644 --- a/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java +++ b/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java @@ -6,18 +6,28 @@ import ch.asynk.rustanddust.RustAndDust; import ch.asynk.rustanddust.engine.Tile; import ch.asynk.rustanddust.engine.Board; import ch.asynk.rustanddust.engine.SelectedTile; +import ch.asynk.rustanddust.engine.util.IterableArray; import ch.asynk.rustanddust.game.Hex; import ch.asynk.rustanddust.game.Army; public abstract class Map0Hex extends Board { protected final RustAndDust game; + protected final IterableArray objectives; public Map0Hex(final RustAndDust game, Texture map, SelectedTile hex) { super(game.factory, map, hex); this.game = game; + this.objectives = new IterableArray(10); + } + + @Override + public void dispose() + { + objectives.clear(); + super.dispose(); } public Hex getHexAt(float x, float y) @@ -45,6 +55,9 @@ public abstract class Map0Hex extends Board Hex hex = getHex(col, row); hex.setObjective(army, (persistent ? Tile.Objective.PERSISTENT : Tile.Objective.VERSATILE)); showObjective(hex, army, !persistent); + if (!objectives.contains(hex)) + objectives.add(hex); + } } public void hexSelect(Hex hex) { selectedTile.set(hex); } -- cgit v1.1-2-g2b99