diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
index 3e72368c319ef927efe0492d639a38d86b5d35ba..10e0e43f0047bad021e6f5b29120b8afc38f6586 100644 (file)
package ru.deadsoftware.cavecraft.game;
package ru.deadsoftware.cavecraft.game;
-import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.utils.TimeUtils;
import ru.deadsoftware.cavecraft.*;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.utils.TimeUtils;
import ru.deadsoftware.cavecraft.*;
+import ru.deadsoftware.cavecraft.AppState;
public class GameInput {
public class GameInput {
break;
case Input.Keys.E:
break;
case Input.Keys.E:
- if (CaveGame.STATE == GameState.GAME_PLAY) CaveGame.STATE = GameState.GAME_CREATIVE_INV;
- else CaveGame.STATE = GameState.GAME_PLAY;
+ if (CaveGame.STATE == AppState.GAME_PLAY) CaveGame.STATE = AppState.GAME_CREATIVE_INV;
+ else CaveGame.STATE = AppState.GAME_PLAY;
break;
case Input.Keys.N:
break;
case Input.Keys.N:
- CaveGame.STATE = GameState.RESTART;
+ CaveGame.STATE = AppState.GOTO_GAME;
+ break;
+
+ case Input.Keys.ESCAPE: case Input.Keys.BACK:
+ CaveGame.STATE = AppState.GOTO_MENU;
+ break;
}
}
}
}
}
public void touchDown(int screenX, int screenY, int button) {
}
public void touchDown(int screenX, int screenY, int button) {
- if (CaveGame.STATE == GameState.GAME_CREATIVE_INV &&
+ if (CaveGame.STATE == AppState.GAME_CREATIVE_INV &&
screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 &&
screenX<gameProc.renderer.camera.viewportWidth/2+Assets.creativeInv.getRegionWidth()/2 &&
screenY>gameProc.renderer.camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2 &&
screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 &&
screenX<gameProc.renderer.camera.viewportWidth/2+Assets.creativeInv.getRegionWidth()/2 &&
screenY>gameProc.renderer.camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2 &&
}
gameProc.player.inventory[0] = item;
}
}
gameProc.player.inventory[0] = item;
}
- } else if (CaveGame.STATE == GameState.GAME_CREATIVE_INV) {
- CaveGame.STATE = GameState.GAME_PLAY;
+ } else if (CaveGame.STATE == AppState.GAME_CREATIVE_INV) {
+ CaveGame.STATE = AppState.GAME_PLAY;
} else {
gameProc.touchDownX = screenX;
gameProc.touchDownY = screenY;
} else {
gameProc.touchDownX = screenX;
gameProc.touchDownY = screenY;