diff --git a/core/src/ru/deadsoftware/cavecraft/GameScreen.java b/core/src/ru/deadsoftware/cavecraft/GameScreen.java
index 682319d184b3e7cbf1a562f8350ff4dead48e7bd..541bc8eafab4f50c7e2963f4d5db22d4c8ba9bb6 100644 (file)
import com.badlogic.gdx.Screen;
import ru.deadsoftware.cavecraft.game.GameProc;
import ru.deadsoftware.cavecraft.game.GameSaver;
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.menu.MenuRenderer;
+import ru.deadsoftware.cavecraft.misc.*;
public class GameScreen implements Screen {
public static int FPS;
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();
private Renderer renderer;
private MenuRenderer menuRenderer;
public GameScreen() {
Assets.load();
Items.load();
- menuRenderer = new MenuRenderer(CaveGame.TOUCH?320:480);
+ menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
renderer = menuRenderer;
Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
}
renderer = menuRenderer;
Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
}
}
private void game(float delta) {
}
private void game(float delta) {
- gameProc.update(delta);
+ gp.update(delta);
}
private void menu() {
}
private void menu() {
@Override
public void render(float delta) {
@Override
public void render(float delta) {
- FPS = (int)(1/delta);
+ FPS = (int) (1 / delta);
switch (CaveGame.STATE) {
switch (CaveGame.STATE) {
- case GAME_PLAY: case GAME_CREATIVE_INV:
+ case GAME_PLAY:
+ case GAME_CREATIVE_INV:
game(delta);
break;
game(delta);
break;
menu();
break;
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;
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;
CaveGame.STATE = AppState.GAME_PLAY;
break;
+ case SAVE_GAME:
+ GameSaver.save(gp);
+ CaveGame.STATE = AppState.MENU_MAIN;
+ break;
+
case GOTO_MENU:
case GOTO_MENU:
+ menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
renderer = menuRenderer;
Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
renderer = menuRenderer;
Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
- CaveGame.STATE = AppState.MENU_MAIN;
break;
}
renderer.render();
break;
}
renderer.render();
public void resize(int width, int height) {
switch (CaveGame.STATE) {
case MENU_MAIN:
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;
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;
}
}
break;
}
}