X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2FGameScreen.java;h=e3278d1bf4c92eb973439dafe1178e9f2a3e8107;hb=cfadf32a4a39d1e437b141b88e103610561ce6ef;hp=fc82bf28ca1544a0b30e916c9d5166e946c49341;hpb=59d07dd8a43cfb159045e6313cca4d519f67a6fc;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/GameScreen.java b/core/src/ru/deadsoftware/cavedroid/GameScreen.java
index fc82bf2..e3278d1 100644
--- a/core/src/ru/deadsoftware/cavedroid/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavedroid/GameScreen.java
@@ -5,15 +5,16 @@ import com.badlogic.gdx.Screen;
 import ru.deadsoftware.cavedroid.game.GameItems;
 import ru.deadsoftware.cavedroid.game.GameProc;
 import ru.deadsoftware.cavedroid.game.GameSaver;
-import ru.deadsoftware.cavedroid.menu.MenuRenderer;
+import ru.deadsoftware.cavedroid.menu.MenuProc;
 import ru.deadsoftware.cavedroid.misc.Assets;
 import ru.deadsoftware.cavedroid.misc.InputHandlerGame;
-import ru.deadsoftware.cavedroid.misc.InputHandlerMenu;
 import ru.deadsoftware.cavedroid.misc.Renderer;
 import ru.deadsoftware.cavedroid.misc.states.AppState;
 import ru.deadsoftware.cavedroid.misc.states.GameState;
 import ru.deadsoftware.cavedroid.misc.states.MenuState;
 
+import javax.annotation.Nullable;
+
 public class GameScreen implements Screen {
 
     public static GameProc GP;
@@ -23,18 +24,16 @@ public class GameScreen implements Screen {
     public static boolean SHOW_MAP = false;
 
     private Renderer renderer;
-    private MenuRenderer menuRenderer;
+    private MenuProc menuProc;
 
-    private InputHandlerGame inputHandlerGame;
-    private InputHandlerMenu inputHandlerMenu;
+    @Nullable private InputHandlerGame inputHandlerGame;
 
     public GameScreen() {
         Assets.load();
         GameItems.load();
-        menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
-        inputHandlerMenu = new InputHandlerMenu(menuRenderer);
-        renderer = menuRenderer;
-        Gdx.input.setInputProcessor(inputHandlerMenu);
+        menuProc = new MenuProc(CaveGame.TOUCH ? 320 : 480);
+        renderer = menuProc;
+        Gdx.input.setInputProcessor(menuProc);
     }
 
     public static float getWidth() {
@@ -69,8 +68,7 @@ public class GameScreen implements Screen {
                 break;
 
             case LOAD:
-                GP.resetRenderer();
-                renderer = GP.renderer;
+                renderer = GP.resetRenderer();
                 if (inputHandlerGame == null) {
                     inputHandlerGame = new InputHandlerGame();
                 }
@@ -84,8 +82,8 @@ public class GameScreen implements Screen {
                 CaveGame.APP_STATE = AppState.MENU;
                 CaveGame.MENU_STATE = MenuState.MAIN;
                 GP.dispose();
-                renderer = menuRenderer;
-                Gdx.input.setInputProcessor(inputHandlerMenu);
+                renderer = menuProc;
+                Gdx.input.setInputProcessor(menuProc);
                 break;
         }
         renderer.render();
@@ -95,13 +93,12 @@ public class GameScreen implements Screen {
     public void resize(int width, int height) {
         switch (CaveGame.APP_STATE) {
             case MENU:
-                menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
-                Gdx.input.setInputProcessor(inputHandlerMenu);
-                renderer = menuRenderer;
+                menuProc = new MenuProc(CaveGame.TOUCH ? 320 : 480);
+                Gdx.input.setInputProcessor(menuProc);
+                renderer = menuProc;
                 break;
             case GAME:
-                GP.resetRenderer();
-                renderer = GP.renderer;
+                renderer = GP.resetRenderer();
                 break;
         }
     }