diff --git a/core/src/ru/deadsoftware/cavedroid/menu/MenuProc.java b/core/src/ru/deadsoftware/cavedroid/menu/MenuProc.java
index 989a5d1d35bdf431aa0b7354d21711a91934da4a..8bc9dd6615f37fec87e79aa0acda38bdd4bb1ac4 100644 (file)
package ru.deadsoftware.cavedroid.menu;
+import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.ObjectMap;
import ru.deadsoftware.cavedroid.CaveGame;
-import ru.deadsoftware.cavedroid.GameScreen;
+import ru.deadsoftware.cavedroid.game.GameScreen;
import ru.deadsoftware.cavedroid.menu.objects.Button;
import ru.deadsoftware.cavedroid.menu.submenus.Menu;
import ru.deadsoftware.cavedroid.menu.submenus.MenuMain;
private Menu currentMenu;
public MenuProc(int width) {
- super(width, width * GameScreen.getHeight() / GameScreen.getWidth());
+ super(width, width * Gdx.graphics.getHeight() / Gdx.graphics.getWidth());
mainMenu = new MenuMain(getWidth(), getHeight(), this::drawButton);
newGameMenu = new MenuNewGame(getWidth(), getHeight(), this::drawButton);
currentMenu = mainMenu;
}
private void update() {
- switch (CaveGame.MENU_STATE) {
- case MAIN:
- currentMenu = mainMenu;
- break;
- case NEW_GAME:
- currentMenu = newGameMenu;
- break;
- case LOADING:
- drawString("Generating World...");
- CaveGame.APP_STATE = AppState.GAME;
- CaveGame.GAME_STATE = GameState.PLAY;
- break;
- case SAVING:
- drawString("Saving Game...");
- CaveGame.APP_STATE = AppState.MENU;
- CaveGame.MENU_STATE = MenuState.MAIN;
- break;
- }
+// switch (CaveGame.MENU_STATE) {
+// case MAIN:
+// currentMenu = mainMenu;
+// break;
+// case NEW_GAME:
+// currentMenu = newGameMenu;
+// break;
+// case LOADING:
+// drawString("Generating World...");
+// CaveGame.APP_STATE = AppState.GAME;
+// CaveGame.GAME_STATE = GameState.PLAY;
+// break;
+// case SAVING:
+// drawString("Saving Game...");
+// CaveGame.APP_STATE = AppState.MENU;
+// CaveGame.MENU_STATE = MenuState.MAIN;
+// break;
+// }
}
@Override
public boolean touchUp(int screenX, int screenY, int pointer, int mb) {
- screenX *= getWidth() / GameScreen.getWidth();
- screenY *= getHeight() / GameScreen.getHeight();
+ screenX *= getWidth() / Gdx.graphics.getWidth();
+ screenY *= getHeight() / Gdx.graphics.getHeight();
for (ObjectMap.Entry<String, Button> entry : currentMenu.getButtons()) {
Button button = entry.value;
if (button.getRect().contains(screenX, screenY)) {
}
@Override
- public void render() {
+ public void render(float delta) {
update();
spriter.begin();
currentMenu.draw(spriter);