summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-10-16 15:46:49 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2014-10-16 15:46:49 +0200
commitcb89c0ecf3967c6787016157322a507662f0d652 (patch)
tree3d471cc3c62f44d7c6bfde1205687019ccd865e2
parentc1ea73e9ad9cc371991189ad7ce5e96264b573c7 (diff)
downloadRustAndDust-cb89c0ecf3967c6787016157322a507662f0d652.zip
RustAndDust-cb89c0ecf3967c6787016157322a507662f0d652.tar.gz
TankOnTank,GameScreen: clean up dispose calls
-rw-r--r--core/src/ch/asynk/tankontank/TankOnTank.java3
-rw-r--r--core/src/ch/asynk/tankontank/screens/GameScreen.java3
2 files changed, 3 insertions, 3 deletions
diff --git a/core/src/ch/asynk/tankontank/TankOnTank.java b/core/src/ch/asynk/tankontank/TankOnTank.java
index ec22fcb..a58d7dc 100644
--- a/core/src/ch/asynk/tankontank/TankOnTank.java
+++ b/core/src/ch/asynk/tankontank/TankOnTank.java
@@ -77,8 +77,9 @@ public class TankOnTank extends Game
public void dispose()
{
Gdx.app.debug("TankOnTank", "dispose()");
- factory.dispose();
getScreen().dispose();
+ factory.dispose();
+ unloadAssets();
}
// @Override
diff --git a/core/src/ch/asynk/tankontank/screens/GameScreen.java b/core/src/ch/asynk/tankontank/screens/GameScreen.java
index b778e78..b8ba533 100644
--- a/core/src/ch/asynk/tankontank/screens/GameScreen.java
+++ b/core/src/ch/asynk/tankontank/screens/GameScreen.java
@@ -232,11 +232,10 @@ public class GameScreen implements Screen
public void dispose()
{
// Gdx.app.debug("GameScreen", "dispose()");
- game.unloadAssets();
mapBatch.dispose();
hudBatch.dispose();
- if (DEBUG) debugShapes.dispose();
ctrl.dispose();
+ if (DEBUG) debugShapes.dispose();
}
@Override