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

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index 2704dbc..545ee3f 100644
--- a/core/src/ru/deadsoftware/cavecraft/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
@@ -2,9 +2,9 @@ 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.game.Items;
 import ru.deadsoftware.cavecraft.menu.MenuRenderer;
 import ru.deadsoftware.cavecraft.misc.*;
 
@@ -13,13 +13,13 @@ 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();
+        GameItems.load();
         menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
         renderer = menuRenderer;
         Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
@@ -34,7 +34,7 @@ public class GameScreen implements Screen {
     }
 
     private void game(float delta) {
-        gameProc.update(delta);
+        gp.update(delta);
     }
 
     private void menu() {
@@ -58,21 +58,21 @@ public class GameScreen implements Screen {
                 break;
 
             case NEW_GAME:
-                gameProc = new GameProc();
-                renderer = gameProc.renderer;
-                Gdx.input.setInputProcessor(new InputHandlerGame(gameProc));
+                gp = new GameProc();
+                renderer = gp.renderer;
+                Gdx.input.setInputProcessor(new InputHandlerGame(gp));
                 CaveGame.STATE = AppState.GAME_PLAY;
                 break;
 
             case LOAD_GAME:
-                gameProc = GameSaver.load();
-                renderer = gameProc.renderer;
-                Gdx.input.setInputProcessor(new InputHandlerGame(gameProc));
+                gp = GameSaver.load();
+                renderer = gp.renderer;
+                Gdx.input.setInputProcessor(new InputHandlerGame(gp));
                 CaveGame.STATE = AppState.GAME_PLAY;
                 break;
 
             case SAVE_GAME:
-                GameSaver.save(gameProc);
+                GameSaver.save(gp);
                 CaveGame.STATE = AppState.MENU_MAIN;
                 break;
 
@@ -94,8 +94,8 @@ public class GameScreen implements Screen {
                 break;
             case GAME_PLAY:
             case GAME_CREATIVE_INV:
-                gameProc.resetRenderer();
-                renderer = gameProc.renderer;
+                gp.resetRenderer();
+                renderer = gp.renderer;
                 break;
         }
     }