diff --git a/core/src/ru/deadsoftware/cavedroid/GameScreen.java b/core/src/ru/deadsoftware/cavedroid/GameScreen.java
index f741dbd62e06c8511c430043bc3eaa9b5bf61090..e3278d1bf4c92eb973439dafe1178e9f2a3e8107 100644 (file)
import ru.deadsoftware.cavedroid.game.GameItems;
import ru.deadsoftware.cavedroid.game.GameProc;
import ru.deadsoftware.cavedroid.game.GameSaver;
import ru.deadsoftware.cavedroid.game.GameItems;
import ru.deadsoftware.cavedroid.game.GameProc;
import ru.deadsoftware.cavedroid.game.GameSaver;
-import ru.deadsoftware.cavedroid.menu.MenuRenderer;
-import ru.deadsoftware.cavedroid.misc.*;
+import ru.deadsoftware.cavedroid.menu.MenuProc;
+import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.misc.InputHandlerGame;
+import ru.deadsoftware.cavedroid.misc.Renderer;
import ru.deadsoftware.cavedroid.misc.states.AppState;
import ru.deadsoftware.cavedroid.misc.states.GameState;
import ru.deadsoftware.cavedroid.misc.states.MenuState;
import ru.deadsoftware.cavedroid.misc.states.AppState;
import ru.deadsoftware.cavedroid.misc.states.GameState;
import ru.deadsoftware.cavedroid.misc.states.MenuState;
+import javax.annotation.Nullable;
+
public class GameScreen implements Screen {
public static GameProc GP;
public class GameScreen implements Screen {
public static GameProc GP;
- public static Renderer RENDERER;
public static int FPS;
public static int FPS;
- public static boolean SHOW_DEBUG = true;
+ public static boolean SHOW_DEBUG = false;
public static boolean SHOW_MAP = false;
public static boolean SHOW_MAP = false;
- public static int NEW_GAME_MODE = 0;
- private MenuRenderer menuRenderer;
+ private Renderer renderer;
+ private MenuProc menuProc;
+
+ @Nullable private InputHandlerGame inputHandlerGame;
public GameScreen() {
Assets.load();
GameItems.load();
public GameScreen() {
Assets.load();
GameItems.load();
- menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
- RENDERER = menuRenderer;
- Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
+ menuProc = new MenuProc(CaveGame.TOUCH ? 320 : 480);
+ renderer = menuProc;
+ Gdx.input.setInputProcessor(menuProc);
}
public static float getWidth() {
}
public static float getWidth() {
break;
case LOAD:
break;
case LOAD:
- GP = GameSaver.load();
- GP.resetRenderer();
- RENDERER = GP.renderer;
- Gdx.input.setInputProcessor(new InputHandlerGame());
+ renderer = GP.resetRenderer();
+ if (inputHandlerGame == null) {
+ inputHandlerGame = new InputHandlerGame();
+ }
+ Gdx.input.setInputProcessor(inputHandlerGame);
CaveGame.APP_STATE = AppState.GAME;
CaveGame.GAME_STATE = GameState.PLAY;
break;
CaveGame.APP_STATE = AppState.GAME;
CaveGame.GAME_STATE = GameState.PLAY;
break;
CaveGame.APP_STATE = AppState.MENU;
CaveGame.MENU_STATE = MenuState.MAIN;
GP.dispose();
CaveGame.APP_STATE = AppState.MENU;
CaveGame.MENU_STATE = MenuState.MAIN;
GP.dispose();
- menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
- RENDERER = menuRenderer;
- Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
+ renderer = menuProc;
+ Gdx.input.setInputProcessor(menuProc);
break;
}
break;
}
- RENDERER.render();
+ renderer.render();
}
@Override
public void resize(int width, int height) {
switch (CaveGame.APP_STATE) {
case MENU:
}
@Override
public void resize(int width, int height) {
switch (CaveGame.APP_STATE) {
case MENU:
- menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
- Gdx.input.setInputProcessor(new InputHandlerMenu(menuRenderer));
- RENDERER = menuRenderer;
+ menuProc = new MenuProc(CaveGame.TOUCH ? 320 : 480);
+ Gdx.input.setInputProcessor(menuProc);
+ renderer = menuProc;
break;
case GAME:
break;
case GAME:
- GP.resetRenderer();
- RENDERER = GP.renderer;
+ renderer = GP.resetRenderer();
break;
}
}
break;
}
}