One GameProc object for everything

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / GameScreen.java

diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index 541bc8eafab4f50c7e2963f4d5db22d4c8ba9bb6..0bbd9966f6a95af78c0f23313ede6657b053b102 100644 (file)
--- 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.*;
 
@@ -12,14 +12,16 @@ public class GameScreen implements Screen {
 
     public static int FPS;
     public static boolean SHOW_DEBUG = false;
+    public static int NEW_GAME_MODE = 0;
+
+    public static GameProc GP;
 
-    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 +36,7 @@ public class GameScreen implements Screen {
     }
 
     private void game(float delta) {
-        gp.update(delta);
+        GP.update(delta);
     }
 
     private void menu() {
@@ -58,21 +60,22 @@ public class GameScreen implements Screen {
                 break;
 
             case NEW_GAME:
-                gp = new GameProc();
-                renderer = gp.renderer;
-                Gdx.input.setInputProcessor(new InputHandlerGame(gp));
+                GP = new GameProc();
+                GP.initGame(NEW_GAME_MODE);
+                renderer = GP.renderer;
+                Gdx.input.setInputProcessor(new InputHandlerGame());
                 CaveGame.STATE = AppState.GAME_PLAY;
                 break;
 
             case LOAD_GAME:
-                gp = GameSaver.load();
-                renderer = gp.renderer;
-                Gdx.input.setInputProcessor(new InputHandlerGame(gp));
+                GP = GameSaver.load();
+                renderer = GP.renderer;
+                Gdx.input.setInputProcessor(new InputHandlerGame());
                 CaveGame.STATE = AppState.GAME_PLAY;
                 break;
 
             case SAVE_GAME:
-                GameSaver.save(gp);
+                GameSaver.save(GP);
                 CaveGame.STATE = AppState.MENU_MAIN;
                 break;
 
@@ -89,13 +92,14 @@ 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);
                 renderer = menuRenderer;
                 break;
             case GAME_PLAY:
             case GAME_CREATIVE_INV:
-                gp.resetRenderer();
-                renderer = gp.renderer;
+                GP.resetRenderer();
+                renderer = GP.renderer;
                 break;
         }
     }