summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-11-30 18:58:15 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-11-30 18:58:15 +0100
commit1e792286a831b99451195ed21d9537716c18cbd4 (patch)
tree4c1e6cee481dee392358cf08e9bab20b4d1c4206 /core
parentc64bd7e354033bda6414c3a51ed9cde414c6541f (diff)
downloadRustAndDust-1e792286a831b99451195ed21d9537716c18cbd4.zip
RustAndDust-1e792286a831b99451195ed21d9537716c18cbd4.tar.gz
resize dice.png, remove attack.mp3, update assets loading
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/tankontank/TankOnTank.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index f6036d8..407e051 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -54,10 +54,11 @@ public class TankOnTank extends Game
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/dice.png", Texture.class);
manager.load("data/shots.png", Texture.class);
manager.load("data/explosions.png", Texture.class);
+ manager.load("sounds/dice.mp3", Sound.class);
manager.load("sounds/move.mp3", Sound.class);
- manager.load("sounds/attack.mp3", Sound.class);
manager.load("sounds/shot.mp3", Sound.class);
manager.load("sounds/short_shot.mp3", Sound.class);
manager.load("sounds/explosion.mp3", Sound.class);
@@ -75,10 +76,11 @@ public class TankOnTank extends Game
manager.unload("data/units.atlas");
manager.unload("data/unit-overlays.atlas");
manager.unload("data/hex-overlays.atlas");
+ manager.unload("data/dice.png");
manager.unload("data/shots.png");
manager.unload("data/explosions.png");
+ manager.unload("sounds/dice.mp3");
manager.unload("sounds/move.mp3");
- manager.unload("sounds/attack.mp3");
manager.unload("sounds/shot.mp3");
manager.unload("sounds/short_shot.mp3");
manager.unload("sounds/explosion.mp3");