From 437b538830028ee14ee5e957a01e77076d5fa96a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Wed, 9 Dec 2015 11:56:04 +0100 Subject: Map0Hex: fix addObjective --- core/src/ch/asynk/rustanddust/game/map/Map0Hex.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java b/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java index 6ed0783..3edc6bd 100644 --- a/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java +++ b/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java @@ -70,21 +70,22 @@ public abstract class Map0Hex extends Board implements ObjectiveSet.ObjectiveCb public void hexExitShow(Hex hex) { enableOverlayOn(hex, Hex.EXIT, true); } public void hexExitHide(Hex hex) { enableOverlayOn(hex, Hex.EXIT, false); } - protected void showObjective(Hex hex, Army army, boolean hold) + @Override + public void showObjective(Tile tile, Faction faction) + { + showObjective((Hex) tile, (Army) faction); + } + + private void showObjective(Hex hex, Army army, boolean hold) { if (hold) enableOverlayOn(hex, Hex.OBJECTIVE_HOLD, true); else enableOverlayOn(hex, Hex.OBJECTIVE, true); + showObjective(hex, army); } - @Override - public void showObjective(Tile tile, Faction faction) - { - showObjective((Hex) tile, (Army) faction); - } - - protected void showObjective(Hex hex, Army army) + private void showObjective(Hex hex, Army army) { if (army == null) army = Army.NONE; -- cgit v1.1-2-g2b99