diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index 2704dbc4e68277ffb5eb44db0cb57b01baa22786..c77c9e08032e6efe725cb6be42d07f248873464d 100644 (file)
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.*;
public static int FPS;
public static boolean SHOW_DEBUG = false;
+ public static int NEW_GAME_MODE = 0;
- 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));
}
private void game(float delta) {
- gameProc.update(delta);
+ gp.update(delta);
}
private void menu() {
break;
case NEW_GAME:
- gameProc = new GameProc();
- renderer = gameProc.renderer;
- Gdx.input.setInputProcessor(new InputHandlerGame(gameProc));
+ gp = new GameProc(NEW_GAME_MODE);
+ 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;
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:
- gameProc.resetRenderer();
- renderer = gameProc.renderer;
+ gp.resetRenderer();
+ renderer = gp.renderer;
break;
}
}