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

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index 1c6ad79..d359fe9 100644
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -3,7 +3,10 @@ package ru.deadsoftware.cavecraft;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Screen;
 import ru.deadsoftware.cavecraft.game.GameProc;
+import ru.deadsoftware.cavecraft.game.GameSaver;
+import ru.deadsoftware.cavecraft.game.Items;
 import ru.deadsoftware.cavecraft.menu.MenuRenderer;
+import ru.deadsoftware.cavecraft.misc.*;
 
 public class GameScreen implements Screen {
 
@@ -38,7 +41,6 @@ public class GameScreen implements Screen {
 
     @Override
     public void show() {
-
     }
 
     @Override
@@ -53,17 +55,29 @@ public class GameScreen implements Screen {
                 menu();
                 break;
 
-            case GOTO_GAME:
+            case NEW_GAME:
                 gameProc = new GameProc();
                 renderer = gameProc.renderer;
                 Gdx.input.setInputProcessor(new InputHandlerGame(gameProc));
                 CaveGame.STATE = AppState.GAME_PLAY;
                 break;
 
+            case LOAD_GAME:
+                gameProc = GameSaver.load();
+                renderer = gameProc.renderer;
+                Gdx.input.setInputProcessor(new InputHandlerGame(gameProc));
+                CaveGame.STATE = AppState.GAME_PLAY;
+                break;
+
+            case SAVE_GAME:
+                GameSaver.save(gameProc);
+                CaveGame.STATE = AppState.MENU_MAIN;
+                break;
+
             case GOTO_MENU:
+                menuRenderer = new MenuRenderer(CaveGame.TOUCH?320:480);
                 renderer = menuRenderer;
                 Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
-                CaveGame.STATE = AppState.MENU_MAIN;
                 break;
         }
         renderer.render();