From a5e60eb6f1d4335406bb53500e7dd87182d67a1a Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Tue, 28 Oct 2014 15:26:10 +0100 Subject: use 4 atlases, set Unit overlays --- core/src/ch/asynk/tankontank/engine/HeadedPawn.java | 6 +++--- core/src/ch/asynk/tankontank/engine/Pawn.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'core/src/ch/asynk/tankontank/engine') diff --git a/core/src/ch/asynk/tankontank/engine/HeadedPawn.java b/core/src/ch/asynk/tankontank/engine/HeadedPawn.java index cbe4cd50..fb362bc9 100644 --- a/core/src/ch/asynk/tankontank/engine/HeadedPawn.java +++ b/core/src/ch/asynk/tankontank/engine/HeadedPawn.java @@ -14,10 +14,10 @@ public abstract class HeadedPawn extends Pawn private Image head; protected Orientation orientation; - public HeadedPawn(Faction faction, TextureAtlas atlas, String pawn, String head) + public HeadedPawn(Faction faction, String pawn, String head, TextureAtlas pawns, TextureAtlas overlays) { - super(faction, atlas, pawn); - this.head = new Image(atlas.findRegion(head)); + super(faction, pawn, pawns, overlays); + this.head = new Image(pawns.findRegion(head)); this.orientation = Orientation.KEEP; this.descr += " " + orientation; } diff --git a/core/src/ch/asynk/tankontank/engine/Pawn.java b/core/src/ch/asynk/tankontank/engine/Pawn.java index a4337969..4d6299fe 100644 --- a/core/src/ch/asynk/tankontank/engine/Pawn.java +++ b/core/src/ch/asynk/tankontank/engine/Pawn.java @@ -79,13 +79,13 @@ public abstract class Pawn implements Moveable, Disposable this.prevPosition = new Vector3(0f, 0f, 0f); } - public Pawn(Faction faction, TextureAtlas atlas, String name) + public Pawn(Faction faction, String name, TextureAtlas pawns, TextureAtlas overlays) { this(); this.faction = faction; this.descr = descr; - this.image = new Image(atlas.findRegion(name)); - this.overlays = new StackedImages(atlas); + this.image = new Image(pawns.findRegion(name)); + this.overlays = new StackedImages(overlays); } @Override -- cgit v1.2.3