summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-09 11:56:04 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-09 11:56:04 +0100
commit437b538830028ee14ee5e957a01e77076d5fa96a (patch)
treec6ef4b3c2ba5367cb43559de42d9fd120467fb43
parent41aa097a355a37fe930d079ad21c11464222b855 (diff)
downloadRustAndDust-437b538830028ee14ee5e957a01e77076d5fa96a.zip
RustAndDust-437b538830028ee14ee5e957a01e77076d5fa96a.tar.gz
Map0Hex: fix addObjective
-rw-r--r--core/src/ch/asynk/rustanddust/game/map/Map0Hex.java17
1 files 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;