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

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index accd1e5..1c6ad79 100644
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -16,7 +16,6 @@ public class GameScreen implements Screen {
     public GameScreen() {
         Assets.load();
         Items.load();
-        gameProc = new GameProc();
         menuRenderer = new MenuRenderer(CaveGame.TOUCH?320:480);
         renderer = menuRenderer;
         Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
@@ -54,17 +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 = GameState.MENU_MAIN;
+                CaveGame.STATE = AppState.MENU_MAIN;
                 break;
         }
         renderer.render();