X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2FGameScreen.java;h=accd1e59cc6ffd25fac1a3f47ae4fd8170e74eca;hp=6daa039bdb5043143300029941094c1b18a10ff5;hb=792296717939ac50df33865ae3acbb010e812ad1;hpb=9837004539187e09f955d347dd6b3d838d9fefb1

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index 6daa039..accd1e5 100644
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -11,13 +11,15 @@ 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() {
@@ -54,9 +56,16 @@ public class GameScreen implements Screen {
 
             case RESTART:
                 gameProc = new GameProc();
+                renderer = gameProc.renderer;
                 Gdx.input.setInputProcessor(new InputHandlerGame(gameProc));
                 CaveGame.STATE = GameState.GAME_PLAY;
                 break;
+
+            case GOTO_MENU:
+                renderer = menuRenderer;
+                Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
+                CaveGame.STATE = GameState.MENU_MAIN;
+                break;
         }
         renderer.render();
     }
@@ -65,10 +74,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;
         }
     }