From b706be0519cfa130acf4e4f4ae9f9827762c8109 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Fri, 20 Nov 2015 15:54:07 +0100 Subject: Map: hex overlay file is given by Factory --- core/src/ch/asynk/rustanddust/game/battles/Factory.java | 4 ++-- core/src/ch/asynk/rustanddust/game/battles/MapA.java | 4 ++-- core/src/ch/asynk/rustanddust/game/battles/MapB.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'core/src/ch/asynk/rustanddust/game/battles') diff --git a/core/src/ch/asynk/rustanddust/game/battles/Factory.java b/core/src/ch/asynk/rustanddust/game/battles/Factory.java index 2e128d30..926d82aa 100644 --- a/core/src/ch/asynk/rustanddust/game/battles/Factory.java +++ b/core/src/ch/asynk/rustanddust/game/battles/Factory.java @@ -84,10 +84,10 @@ public class Factory implements Board.TileBuilder, Disposable Map m = null; switch(t) { case MAP_A: - m = new MapA(game, "data/map_a.png"); + m = new MapA(game, "data/map_a.png", "data/hex.png"); break; case MAP_B: - m = new MapB(game, "data/map_b.png"); + m = new MapB(game, "data/map_b.png", "data/hex.png"); break; } diff --git a/core/src/ch/asynk/rustanddust/game/battles/MapA.java b/core/src/ch/asynk/rustanddust/game/battles/MapA.java index f7d33c40..8e772b8e 100644 --- a/core/src/ch/asynk/rustanddust/game/battles/MapA.java +++ b/core/src/ch/asynk/rustanddust/game/battles/MapA.java @@ -8,9 +8,9 @@ import ch.asynk.rustanddust.game.Hex; public class MapA extends Map { - public MapA(final RustAndDust game, String textureName) + public MapA(final RustAndDust game, String map, String hex) { - super(game, textureName); + super(game, map, hex); } @Override diff --git a/core/src/ch/asynk/rustanddust/game/battles/MapB.java b/core/src/ch/asynk/rustanddust/game/battles/MapB.java index 2b8838c3..f882f694 100644 --- a/core/src/ch/asynk/rustanddust/game/battles/MapB.java +++ b/core/src/ch/asynk/rustanddust/game/battles/MapB.java @@ -8,9 +8,9 @@ import ch.asynk.rustanddust.game.Hex; public class MapB extends Map { - public MapB(final RustAndDust game, String textureName) + public MapB(final RustAndDust game, String map, String hex) { - super(game, textureName); + super(game, map, hex); } @Override -- cgit v1.2.3