diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-20 13:38:51 +0100 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-11-20 13:38:51 +0100 |
| commit | 4afc2ac7c837ae645733109a161305c804a1b45a (patch) | |
| tree | 223875875e27031fc796192b4ab6c9a9b03aeafa /core/src/ch/asynk/tankontank/game/Map.java | |
| parent | 661409680c14f8999b5bb2c32e616a42be361fa2 (diff) | |
| download | RustAndDust-4afc2ac7c837ae645733109a161305c804a1b45a.zip RustAndDust-4afc2ac7c837ae645733109a161305c804a1b45a.tar.gz | |
engine.TileSet/Zone are dead: welcome game.HexSet/Zone
Diffstat (limited to 'core/src/ch/asynk/tankontank/game/Map.java')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Map.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index e02073d..2a5ff2f 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -12,7 +12,6 @@ import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import ch.asynk.tankontank.TankOnTank; import ch.asynk.tankontank.engine.Pawn; import ch.asynk.tankontank.engine.PawnSet; -import ch.asynk.tankontank.engine.TileSet; import ch.asynk.tankontank.engine.Board; import ch.asynk.tankontank.engine.Orientation; import ch.asynk.tankontank.engine.Meteorology; @@ -29,7 +28,7 @@ public abstract class Map extends Board private Random rand = new Random(); - public final Board.TileCollection possibleMoves; + public final HexSet possibleMoves; public final PossiblePaths possiblePaths; public final Board.PawnCollection moveablePawns; @@ -65,7 +64,7 @@ public abstract class Map extends Board setup(); - possibleMoves = new TileSet(this, 40); + possibleMoves = new HexSet(this, 40); possiblePaths = new PossiblePaths(this, 10, 20, 5, 10); moveablePawns = new PawnSet(this, 6); @@ -115,7 +114,7 @@ public abstract class Map extends Board possibleMoves.clear(); return 0; } - return collectPossibleMoves(unit, possibleMoves); + return collectPossibleMoves(unit, possibleMoves.hexAsTiles()); } public int togglePossiblePathHex(Hex hex) |