summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-09-19 15:37:27 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2014-09-19 15:37:27 +0200
commit9d3f9bb6d1d69a062df94aaceef98c1954efdd97 (patch)
treeed8e20a27143ad3b202a1c0c47506063b5747a4f /core
parent80b5a3ee896d450525ac129c3442f0ec792523d9 (diff)
downloadRustAndDust-9d3f9bb6d1d69a062df94aaceef98c1954efdd97.zip
RustAndDust-9d3f9bb6d1d69a062df94aaceef98c1954efdd97.tar.gz
repack armies
Diffstat (limited to 'core')
-rw-r--r--core/src/ch/asynk/tankontank/TankOnTank.java8
-rw-r--r--core/src/ch/asynk/tankontank/game/GameFactory.java4
2 files changed, 6 insertions, 6 deletions
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index 99f708f..8501e19 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -34,9 +34,9 @@ public class TankOnTank extends Game
// manager.load("images/map_b.png", Texture.class);
manager.load("images/dice.pack", TextureAtlas.class);
manager.load("images/counters.pack", TextureAtlas.class);
- manager.load("images/ge.pack", TextureAtlas.class);
- manager.load("images/us.pack", TextureAtlas.class);
manager.load("images/hex.png", Texture.class);
+ manager.load("images/ge.atlas", TextureAtlas.class);
+ manager.load("images/us.atlas", TextureAtlas.class);
// manager.load("images/cup.jpg", Texture.class);
// manager.load("images/small.png", Texture.class);
}
@@ -49,9 +49,9 @@ public class TankOnTank extends Game
// manager.unload("images/map_b.png");
manager.unload("images/dice.pack");
manager.unload("images/counters.pack");
- manager.unload("images/ge.pack");
- manager.unload("images/us.pack");
manager.unload("images/hex.png");
+ manager.unload("images/ge.atlas");
+ manager.unload("images/us.atlas");
// manager.unload("images/cup.jpg");
// manager.unload("images/small.png");
Gdx.app.debug("TankOnTank", "diagnostics:\n" + manager.getDiagnostics() );
diff --git a/core/src/ch/asynk/tankontank/game/GameFactory.java b/core/src/ch/asynk/tankontank/game/GameFactory.java
index 8716c49..27fc239 100644
--- a/core/src/ch/asynk/tankontank/game/GameFactory.java
+++ b/core/src/ch/asynk/tankontank/game/GameFactory.java
@@ -16,8 +16,8 @@ public class GameFactory
public static void init(AssetManager manager)
{
- usAtlas = manager.get("images/us.pack", TextureAtlas.class);
- geAtlas = manager.get("images/ge.pack", TextureAtlas.class);
+ usAtlas = manager.get("images/us.atlas", TextureAtlas.class);
+ geAtlas = manager.get("images/ge.atlas", TextureAtlas.class);
}
public static void dispose()