summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-22 20:20:43 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-22 20:20:43 +0100
commit498259468be4e9f73319c9a63fb1782e8bbe5088 (patch)
tree11b6ad4759866010e4f41eb2577191ec20b9a75a /core
parent70454c52445b797efc2384b92d6992aea3779ea1 (diff)
downloadRustAndDust-498259468be4e9f73319c9a63fb1782e8bbe5088.zip
RustAndDust-498259468be4e9f73319c9a63fb1782e8bbe5088.tar.gz
rename pawn tile atlases to unit hex
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/tankontank/TankOnTank.java12
-rw-r--r--core/src/ch/asynk/tankontank/game/battles/Factory.java6
2 files changed, 9 insertions, 9 deletions
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index dff4df2..a80325d 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -51,9 +51,9 @@ public class TankOnTank extends Game
manager.load("data/map_a.png", Texture.class);
manager.load("data/map_b.png", Texture.class);
manager.load("data/hud.atlas", TextureAtlas.class);
- manager.load("data/pawns.atlas", TextureAtlas.class);
- manager.load("data/pawn-overlays.atlas", TextureAtlas.class);
- manager.load("data/tile-overlays.atlas", TextureAtlas.class);
+ manager.load("data/units.atlas", TextureAtlas.class);
+ manager.load("data/unit-overlays.atlas", TextureAtlas.class);
+ manager.load("data/hex-overlays.atlas", TextureAtlas.class);
manager.load("data/explosion.png", Texture.class);
manager.load("data/explosions.png", Texture.class);
manager.load("sounds/move.mp3", Sound.class);
@@ -67,9 +67,9 @@ public class TankOnTank extends Game
manager.unload("data/map_a.png");
manager.unload("data/map_b.png");
manager.unload("data/hud.atlas");
- manager.unload("data/pawns.atlas");
- manager.unload("data/pawn-overlays.atlas");
- manager.unload("data/tile-overlays.atlas");
+ manager.unload("data/units.atlas");
+ manager.unload("data/unit-overlays.atlas");
+ manager.unload("data/hex-overlays.atlas");
manager.unload("data/explosion.png");
manager.unload("data/explosions.png");
manager.unload("sounds/move.mp3");
diff --git a/core/src/ch/asynk/tankontank/game/battles/Factory.java b/core/src/ch/asynk/tankontank/game/battles/Factory.java
index f93a58f..b0020fb 100644
--- a/core/src/ch/asynk/tankontank/game/battles/Factory.java
+++ b/core/src/ch/asynk/tankontank/game/battles/Factory.java
@@ -56,9 +56,9 @@ public class Factory implements Board.TileBuilder, Disposable
public void assetsLoaded()
{
this.hudAtlas = game.manager.get("data/hud.atlas", TextureAtlas.class);
- this.pawnsAtlas = game.manager.get("data/pawns.atlas", TextureAtlas.class);
- this.pawnOverlaysAtlas = game.manager.get("data/pawn-overlays.atlas", TextureAtlas.class);
- this.tileOverlaysAtlas = game.manager.get("data/tile-overlays.atlas", TextureAtlas.class);
+ this.pawnsAtlas = game.manager.get("data/units.atlas", TextureAtlas.class);
+ this.pawnOverlaysAtlas = game.manager.get("data/unit-overlays.atlas", TextureAtlas.class);
+ this.tileOverlaysAtlas = game.manager.get("data/hex-overlays.atlas", TextureAtlas.class);
}
@Override