diff --git a/core/src/ru/deadsoftware/cavedroid/GameScreen.java b/core/src/ru/deadsoftware/cavedroid/GameScreen.java
index 09604fd4b79bb6a4c1661649513cd72f045ab15b..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.menu.MenuProc;
import ru.deadsoftware.cavedroid.misc.Assets;
import ru.deadsoftware.cavedroid.misc.InputHandlerGame;
import ru.deadsoftware.cavedroid.misc.Assets;
import ru.deadsoftware.cavedroid.misc.InputHandlerGame;
-import ru.deadsoftware.cavedroid.misc.InputHandlerMenu;
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.Renderer;
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 boolean SHOW_MAP = false;
private Renderer renderer;
public static boolean SHOW_MAP = false;
private Renderer renderer;
- private MenuRenderer menuRenderer;
+ private MenuProc menuProc;
- private InputHandlerGame inputHandlerGame;
- private final InputHandlerMenu inputHandlerMenu;
+ @Nullable private InputHandlerGame inputHandlerGame;
public GameScreen() {
Assets.load();
GameItems.load();
public GameScreen() {
Assets.load();
GameItems.load();
- menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
- inputHandlerMenu = new InputHandlerMenu(menuRenderer);
- renderer = menuRenderer;
- Gdx.input.setInputProcessor(inputHandlerMenu);
+ 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.resetRenderer();
- renderer = GP.renderer;
+ renderer = GP.resetRenderer();
if (inputHandlerGame == null) {
inputHandlerGame = new InputHandlerGame();
}
if (inputHandlerGame == null) {
inputHandlerGame = new InputHandlerGame();
}
CaveGame.APP_STATE = AppState.MENU;
CaveGame.MENU_STATE = MenuState.MAIN;
GP.dispose();
CaveGame.APP_STATE = AppState.MENU;
CaveGame.MENU_STATE = MenuState.MAIN;
GP.dispose();
- renderer = menuRenderer;
- Gdx.input.setInputProcessor(inputHandlerMenu);
+ renderer = menuProc;
+ Gdx.input.setInputProcessor(menuProc);
break;
}
renderer.render();
break;
}
renderer.render();
public void resize(int width, int height) {
switch (CaveGame.APP_STATE) {
case MENU:
public void resize(int width, int height) {
switch (CaveGame.APP_STATE) {
case MENU:
- menuRenderer = new MenuRenderer(CaveGame.TOUCH ? 320 : 480);
- Gdx.input.setInputProcessor(inputHandlerMenu);
- 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;
}
}