diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
index e8c31be65e7c4eb2f2409a1952cf7aa8a87d0d63..dc19afdb0f42a6bd207fe3fc04956f274e85fb54 100644 (file)
this.gameProc = gameProc;
}
- private void wasdPressed(int keyCode) {
- if (gameProc.ctrlMode==0) {
- switch (keyCode) {
+ private void wasdPressed(int keycode) {
+ if (gameProc.ctrlMode==0 || !CaveGame.TOUCH) {
+ switch (keycode) {
case Input.Keys.A:
gameProc.player.moveX.x = -GamePhysics.PL_SPEED;
gameProc.player.dir = 0;
gameProc.player.dir = 1;
break;
}
- } else {
- switch (keyCode) {
+ } else if (CaveGame.TOUCH){
+ switch (keycode) {
case Input.Keys.A:
gameProc.cursorX--;
break;
gameProc.cursorY++;
break;
}
- if (gameProc.cursorX<(gameProc.player.position.x+gameProc.player.texWidth/2)/16)
- gameProc.player.dir=0;
- if (gameProc.cursorX>(gameProc.player.position.x+gameProc.player.texWidth/2)/16)
- gameProc.player.dir=1;
}
}
- public void keyDown(int keyCode) {
- if (keyCode == Input.Keys.W || keyCode == Input.Keys.A ||
- keyCode == Input.Keys.S || keyCode == Input.Keys.D) {
- wasdPressed(keyCode);
- } else switch (keyCode) {
+ public void keyDown(int keycode) {
+ gameProc.isKeyDown = true;
+ gameProc.keyDownCode = keycode;
+ if (keycode == Input.Keys.W || keycode == Input.Keys.A ||
+ keycode == Input.Keys.S || keycode == Input.Keys.D) {
+ wasdPressed(keycode);
+ } else switch (keycode) {
case Input.Keys.ALT_LEFT:
- gameProc.ctrlMode++;
- if (gameProc.ctrlMode > 1) gameProc.ctrlMode = 0;
+ if (CaveGame.TOUCH) {
+ gameProc.ctrlMode++;
+ if (gameProc.ctrlMode > 1) gameProc.ctrlMode = 0;
+ }
break;
case Input.Keys.SPACE:
if (CaveGame.STATE == GameState.GAME_PLAY) CaveGame.STATE = GameState.GAME_CREATIVE_INV;
else CaveGame.STATE = GameState.GAME_PLAY;
break;
+
+ case Input.Keys.N:
+ CaveGame.STATE = GameState.RESTART;
}
}
- public void keyUp(int keyCode) {
- switch (keyCode) {
+ public void keyUp(int keycode) {
+ switch (keycode) {
case Input.Keys.A: case Input.Keys.D:
gameProc.player.moveX.x = 0;
break;
screenX<gameProc.renderer.camera.viewportWidth/2+Assets.creativeInv.getRegionWidth()/2 &&
screenY>gameProc.renderer.camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2 &&
screenY<gameProc.renderer.camera.viewportHeight/2+Assets.creativeInv.getRegionHeight()/2) {
- try {
- int ix = (int) (screenX - (gameProc.renderer.camera.viewportWidth / 2 - Assets.creativeInv.getRegionWidth() / 2 + 8)) / 18;
- int iy = (int) (screenY - (gameProc.renderer.camera.viewportHeight / 2 - Assets.creativeInv.getRegionHeight() / 2 + 18)) / 18;
- int item = ix + iy * 8;
+ int ix = (int) (screenX - (gameProc.renderer.camera.viewportWidth / 2 - Assets.creativeInv.getRegionWidth() / 2 + 8)) / 18;
+ int iy = (int) (screenY - (gameProc.renderer.camera.viewportHeight / 2 - Assets.creativeInv.getRegionHeight() / 2 + 18)) / 18;
+ int item = ix + iy * 8;
+ if (item >= 0 && item < Items.BLOCKS.size) {
for (int i = 8; i > 0; i--) {
gameProc.player.inventory[i] = gameProc.player.inventory[i - 1];
}
- if (item >= 0 && item < Items.BLOCKS.size) gameProc.player.inventory[0] = item;
- } catch (Exception e) {
- Gdx.app.error("GameInputHandler", e.toString());
+ gameProc.player.inventory[0] = item;
}
} else if (CaveGame.STATE == GameState.GAME_CREATIVE_INV) {
CaveGame.STATE = GameState.GAME_PLAY;
}
public void touchUp(int screenX, int screenY, int button) {
+ if (gameProc.isKeyDown) {
+ keyUp(gameProc.keyDownCode);
+ gameProc.isKeyDown = false;
+ }
if (gameProc.isTouchDown) {
if (button == Input.Buttons.RIGHT){
gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY,