X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2FGameScreen.java;h=545ee3f74f0f500f13481286b2f6a5f284be8006;hb=5fd3c5a7647fbf36de84ff184f58fad5e0e30644;hp=682319d184b3e7cbf1a562f8350ff4dead48e7bd;hpb=6ab2a53526f16de139d39a59c3d800e5f3013c68;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index 682319d..545ee3f 100644
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -2,22 +2,25 @@ package ru.deadsoftware.cavecraft;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Screen;
+import ru.deadsoftware.cavecraft.game.GameItems;
 import ru.deadsoftware.cavecraft.game.GameProc;
 import ru.deadsoftware.cavecraft.game.GameSaver;
 import ru.deadsoftware.cavecraft.menu.MenuRenderer;
+import ru.deadsoftware.cavecraft.misc.*;
 
 public class GameScreen implements Screen {
 
     public static int FPS;
+    public static boolean SHOW_DEBUG = false;
 
-    private GameProc gameProc;
+    private GameProc gp;
     private Renderer renderer;
     private MenuRenderer menuRenderer;
 
     public GameScreen() {
         Assets.load();
-        Items.load();
-        menuRenderer = new MenuRenderer(CaveGame.TOUCH?320:480);
+        GameItems.load();
+        menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
         renderer = menuRenderer;
         Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
     }
@@ -31,7 +34,7 @@ public class GameScreen implements Screen {
     }
 
     private void game(float delta) {
-        gameProc.update(delta);
+        gp.update(delta);
     }
 
     private void menu() {
@@ -43,9 +46,10 @@ public class GameScreen implements Screen {
 
     @Override
     public void render(float delta) {
-        FPS = (int)(1/delta);
+        FPS = (int) (1 / delta);
         switch (CaveGame.STATE) {
-            case GAME_PLAY: case GAME_CREATIVE_INV:
+            case GAME_PLAY:
+            case GAME_CREATIVE_INV:
                 game(delta);
                 break;
 
@@ -53,24 +57,29 @@ public class GameScreen implements Screen {
                 menu();
                 break;
 
-            case GOTO_NEW_GAME:
-                gameProc = new GameProc();
-                renderer = gameProc.renderer;
-                Gdx.input.setInputProcessor(new InputHandlerGame(gameProc));
+            case NEW_GAME:
+                gp = new GameProc();
+                renderer = gp.renderer;
+                Gdx.input.setInputProcessor(new InputHandlerGame(gp));
                 CaveGame.STATE = AppState.GAME_PLAY;
                 break;
 
-            case GOTO_LOAD_GAME:_GAME:
-                gameProc = GameSaver.load();
-                renderer = gameProc.renderer;
-                Gdx.input.setInputProcessor(new InputHandlerGame(gameProc));
+            case LOAD_GAME:
+                gp = GameSaver.load();
+                renderer = gp.renderer;
+                Gdx.input.setInputProcessor(new InputHandlerGame(gp));
                 CaveGame.STATE = AppState.GAME_PLAY;
                 break;
 
+            case SAVE_GAME:
+                GameSaver.save(gp);
+                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();
@@ -80,12 +89,13 @@ public class GameScreen implements Screen {
     public void resize(int width, int height) {
         switch (CaveGame.STATE) {
             case MENU_MAIN:
-                menuRenderer = new MenuRenderer(CaveGame.TOUCH?320:480);
+                menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
                 renderer = menuRenderer;
                 break;
-            case GAME_PLAY: case GAME_CREATIVE_INV:
-                gameProc.resetRenderer();
-                renderer = gameProc.renderer;
+            case GAME_PLAY:
+            case GAME_CREATIVE_INV:
+                gp.resetRenderer();
+                renderer = gp.renderer;
                 break;
         }
     }