diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/Map.java | 11 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/MapA.java | 5 | ||||
| -rw-r--r-- | core/src/ch/asynk/tankontank/game/MapB.java | 5 | 
3 files changed, 12 insertions, 9 deletions
| diff --git a/core/src/ch/asynk/tankontank/game/Map.java b/core/src/ch/asynk/tankontank/game/Map.java index 4df7077..c4ce8bc 100644 --- a/core/src/ch/asynk/tankontank/game/Map.java +++ b/core/src/ch/asynk/tankontank/game/Map.java @@ -12,6 +12,7 @@ import com.badlogic.gdx.math.Vector3;  import com.badlogic.gdx.math.GridPoint2;  import com.badlogic.gdx.graphics.glutils.ShapeRenderer; +import ch.asynk.tankontank.TankOnTank;  import ch.asynk.tankontank.engine.Pawn;  import ch.asynk.tankontank.engine.Board;  import ch.asynk.tankontank.engine.Orientation; @@ -38,12 +39,12 @@ public abstract class Map extends Board      protected abstract void setup(); -    public Map(Ctrl ctrl, Factory factory, Board.Config cfg, AssetManager manager, String textureName) +    public Map(final TankOnTank game, Board.Config cfg, String textureName)      { -        super(factory, cfg, manager.get(textureName, Texture.class)); -        this.ctrl = ctrl; -        this.explosion = new SpriteAnimation(manager.get("data/explosion.png", Texture.class), 10, 4, 40); -        this.explosions = new SpriteAnimation(manager.get("data/explosions.png", Texture.class), 16, 8, 15); +        super(game.factory, cfg, game.manager.get(textureName, Texture.class)); +        this.ctrl = game.ctrl; +        this.explosion = new SpriteAnimation(game.manager.get("data/explosion.png", Texture.class), 10, 4, 40); +        this.explosions = new SpriteAnimation(game.manager.get("data/explosions.png", Texture.class), 16, 8, 15);          setup();      } diff --git a/core/src/ch/asynk/tankontank/game/MapA.java b/core/src/ch/asynk/tankontank/game/MapA.java index 3600079..0f33bcb 100644 --- a/core/src/ch/asynk/tankontank/game/MapA.java +++ b/core/src/ch/asynk/tankontank/game/MapA.java @@ -4,14 +4,15 @@ import com.badlogic.gdx.assets.AssetManager;  import com.badlogic.gdx.graphics.Texture;  import com.badlogic.gdx.graphics.g2d.TextureAtlas; +import ch.asynk.tankontank.TankOnTank;  import ch.asynk.tankontank.engine.Board;  import ch.asynk.tankontank.engine.Orientation;  public class MapA extends Map  { -    public MapA(Ctrl ctrl, Factory factory, Board.Config cfg, AssetManager manager, String textureName) +    public MapA(final TankOnTank game, Board.Config cfg, String textureName)      { -        super(ctrl, factory, cfg, manager, textureName); +        super(game, cfg, textureName);      }      @Override diff --git a/core/src/ch/asynk/tankontank/game/MapB.java b/core/src/ch/asynk/tankontank/game/MapB.java index 073f653..7314aea 100644 --- a/core/src/ch/asynk/tankontank/game/MapB.java +++ b/core/src/ch/asynk/tankontank/game/MapB.java @@ -4,14 +4,15 @@ import com.badlogic.gdx.assets.AssetManager;  import com.badlogic.gdx.graphics.Texture;  import com.badlogic.gdx.graphics.g2d.TextureAtlas; +import ch.asynk.tankontank.TankOnTank;  import ch.asynk.tankontank.engine.Board;  import ch.asynk.tankontank.engine.Orientation;  public class MapB extends Map  { -    public MapB(Ctrl ctrl, Factory factory, Board.Config cfg, AssetManager manager, String textureName) +    public MapB(final TankOnTank game, Board.Config cfg, String textureName)      { -        super(ctrl, factory, cfg, manager, textureName); +        super(game, cfg, textureName);      }      @Override | 
