X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2FGameScreen.java;h=1c6ad795349289701f3a2bfaeb29503a799f0fba;hb=d1510d8504e14edc4b21ded60c8b5f0b910806c2;hp=6daa039bdb5043143300029941094c1b18a10ff5;hpb=4140ddda97930af75b0d50b821ed9eb6337273e2;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index 6daa039..1c6ad79 100644
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -11,13 +11,14 @@ public class GameScreen implements Screen {
 
     private GameProc gameProc;
     private Renderer renderer;
+    private MenuRenderer menuRenderer;
 
     public GameScreen() {
         Assets.load();
         Items.load();
-        gameProc = new GameProc();
-        renderer = new MenuRenderer();
-        Gdx.input.setInputProcessor(new InputHandlerMenu());
+        menuRenderer = new MenuRenderer(CaveGame.TOUCH?320:480);
+        renderer = menuRenderer;
+        Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
     }
 
     public static int getWidth() {
@@ -52,10 +53,17 @@ public class GameScreen implements Screen {
                 menu();
                 break;
 
-            case RESTART:
+            case GOTO_GAME:
                 gameProc = new GameProc();
+                renderer = gameProc.renderer;
                 Gdx.input.setInputProcessor(new InputHandlerGame(gameProc));
-                CaveGame.STATE = GameState.GAME_PLAY;
+                CaveGame.STATE = AppState.GAME_PLAY;
+                break;
+
+            case GOTO_MENU:
+                renderer = menuRenderer;
+                Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
+                CaveGame.STATE = AppState.MENU_MAIN;
                 break;
         }
         renderer.render();
@@ -65,10 +73,12 @@ public class GameScreen implements Screen {
     public void resize(int width, int height) {
         switch (CaveGame.STATE) {
             case MENU_MAIN:
-                renderer = new MenuRenderer();
+                menuRenderer = new MenuRenderer(CaveGame.TOUCH?320:480);
+                renderer = menuRenderer;
                 break;
             case GAME_PLAY: case GAME_CREATIVE_INV:
                 gameProc.resetRenderer();
+                renderer = gameProc.renderer;
                 break;
         }
     }