summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/rustanddust/game/map
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2015-12-21 19:46:54 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2015-12-21 19:46:54 +0100
commit7f1b60094b5d351c58194feabad1fef903d1d3be (patch)
treebaca50d5b34573c498ee48d73789462d14f79ecd /core/src/ch/asynk/rustanddust/game/map
parentb8d524c48af7b38eaec7d2547844c8b76b7009d6 (diff)
downloadRustAndDust-7f1b60094b5d351c58194feabad1fef903d1d3be.zip
RustAndDust-7f1b60094b5d351c58194feabad1fef903d1d3be.tar.gz
Map0Hex: isObjective(Tile) -> isObjectiveFor(Tile,Pawn) : says no if already owned
Diffstat (limited to 'core/src/ch/asynk/rustanddust/game/map')
-rw-r--r--core/src/ch/asynk/rustanddust/game/map/Map0Hex.java8
1 files changed, 6 insertions, 2 deletions
diff --git a/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java b/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java
index 0d28829..41270d1 100644
--- a/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java
+++ b/core/src/ch/asynk/rustanddust/game/map/Map0Hex.java
@@ -4,6 +4,7 @@ import com.badlogic.gdx.graphics.Texture;
import ch.asynk.rustanddust.RustAndDust;
import ch.asynk.rustanddust.engine.Tile;
+import ch.asynk.rustanddust.engine.Pawn;
import ch.asynk.rustanddust.engine.Board;
import ch.asynk.rustanddust.engine.Faction;
import ch.asynk.rustanddust.engine.SelectedTile;
@@ -76,9 +77,12 @@ public abstract class Map0Hex extends Board implements ObjectiveSet.ObjectiveCb
public void hexExitHide(Hex hex) { enableOverlayOn(hex, Hex.EXIT, false); }
@Override
- public boolean isObjective(Tile tile)
+ public boolean isObjectiveFor(Tile tile, Pawn pawn)
{
- return objectives.containsKey(tile);
+ if (!objectives.containsKey(tile))
+ return false;
+
+ return (objectives.get(tile).faction() != pawn.getFaction());
}
@Override