diff options
author | Jérémy Zurcher <jeremy@asynk.ch> | 2014-12-30 21:48:26 +0100 |
---|---|---|
committer | Jérémy Zurcher <jeremy@asynk.ch> | 2014-12-30 21:48:26 +0100 |
commit | 30a62fe41ebbdd37c0aa91d6ef5223ac29276ca4 (patch) | |
tree | 02ad05a09f49561f17f54f41289d886af2ee3783 /core/src/ch/asynk/tankontank/screens | |
parent | 9d5146d953453abda8cbbe35d4a42ea2ce198d90 (diff) | |
download | RustAndDust-30a62fe41ebbdd37c0aa91d6ef5223ac29276ca4.zip RustAndDust-30a62fe41ebbdd37c0aa91d6ef5223ac29276ca4.tar.gz |
TankOnTank: does the screen switching
Diffstat (limited to 'core/src/ch/asynk/tankontank/screens')
-rw-r--r-- | core/src/ch/asynk/tankontank/screens/LoadScreen.java | 3 | ||||
-rw-r--r-- | core/src/ch/asynk/tankontank/screens/OptionsScreen.java | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/src/ch/asynk/tankontank/screens/LoadScreen.java b/core/src/ch/asynk/tankontank/screens/LoadScreen.java index 8aea946..1b4b401 100644 --- a/core/src/ch/asynk/tankontank/screens/LoadScreen.java +++ b/core/src/ch/asynk/tankontank/screens/LoadScreen.java @@ -139,8 +139,7 @@ public class LoadScreen implements Screen if (assetsLoaded) return; assetsLoaded = true; TankOnTank.debug("LoadScreen", "assets ready : " + (Gdx.app.getJavaHeap()/1024.0f) + "KB"); - game.onLoaded(); - game.setScreen(new OptionsScreen(game)); + game.switchToOptions(); dispose(); } } diff --git a/core/src/ch/asynk/tankontank/screens/OptionsScreen.java b/core/src/ch/asynk/tankontank/screens/OptionsScreen.java index 01a33a7..371cb64 100644 --- a/core/src/ch/asynk/tankontank/screens/OptionsScreen.java +++ b/core/src/ch/asynk/tankontank/screens/OptionsScreen.java @@ -121,7 +121,7 @@ public class OptionsScreen implements Screen } public void touchUp (InputEvent event, float x, float y, int pointer, int button) { apply(); - game.setScreen(new GameScreen(game)); + game.switchToGame(); } }); |