summaryrefslogtreecommitdiffstats
path: root/core/src/ch/asynk/tankontank
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-10-29 09:54:53 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-10-29 09:54:53 +0100
commit1415dfab3ed8126cf0ffa2061bcd61cf3196c6d7 (patch)
treea57439702e241b3019702130d94bc9efa841af00 /core/src/ch/asynk/tankontank
parent1e0bef46c8e1ed02c35adfa975a0abf9dce13896 (diff)
downloadRustAndDust-1415dfab3ed8126cf0ffa2061bcd61cf3196c6d7.zip
RustAndDust-1415dfab3ed8126cf0ffa2061bcd61cf3196c6d7.tar.gz
Map: remove useless HexSet and UnitSet classes, use TileSet and PawnSet
Diffstat (limited to 'core/src/ch/asynk/tankontank')
-rw-r--r--core/src/ch/asynk/tankontank/game/Map.java26
1 files changed, 5 insertions, 21 deletions
diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java
index 0bdd46b..c7e1390 100644
--- a/core/src/ch/asynk/tankontank/game/Map.java
+++ b/core/src/ch/asynk/tankontank/game/Map.java
@@ -21,22 +21,6 @@ import ch.asynk.tankontank.engine.gfx.animations.RunnableAnimation;
public abstract class Map extends Board
{
- public class HexSet extends TileSet
- {
- public HexSet(Map map, int overlay, int n)
- {
- super(map, overlay, n);
- }
- }
-
- public class UnitSet extends PawnSet
- {
- public UnitSet(Map map, int overlay, int n)
- {
- super(map, overlay, n);
- }
- }
-
private final Ctrl ctrl;
public final Board.TileCollection possibleMoves;
@@ -59,12 +43,12 @@ public abstract class Map extends Board
this.explosions = new SpriteAnimation(game.manager.get("data/explosions.png", Texture.class), 16, 8, 15);
setup();
- possibleMoves = new HexSet(this, Hex.MOVE1, 40);
- possiblePaths = new HexSet(this, Hex.MOVE1, 10); // Hex.MOVE2
- moveablePawns = new UnitSet(this, Unit.MOVE, 6);
+ possibleMoves = new TileSet(this, Hex.MOVE1, 40);
+ possiblePaths = new TileSet(this, Hex.MOVE1, 10); // Hex.MOVE2
+ moveablePawns = new PawnSet(this, Unit.MOVE, 6);
- possibleTargets = new UnitSet(this, Unit.TARGET, 10);
- attackAssists = new UnitSet(this, Unit.ATTACK_ASSIST, 6);
+ possibleTargets = new PawnSet(this, Unit.TARGET, 10);
+ attackAssists = new PawnSet(this, Unit.ATTACK_ASSIST, 6);
}
@Override