X-Git-Url: http://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameInput.java;h=687c6a9e5e6d919f96ab41b7dc0ee5ffbfd1bd06;hp=48388ac465995e8a9b618234a7729b08110f1e57;hb=e31e819b4fc6afdc3612e0ada5066dab638e89ac;hpb=8c0966b107ebbf261f8aa9c516fb90b0d9d230e5 diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java index 48388ac..687c6a9 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java +++ b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java @@ -73,10 +73,10 @@ public class GameInput { gp.swim = true; } else if (gp.player.canJump) { gp.player.move.add(0, -7); - } else if (!gp.player.flyMode) { + } else if (!gp.player.flyMode && gp.player.gameMode == 1) { gp.player.flyMode = true; gp.player.move.y = 0; - } else { + } else if (gp.player.flyMode) { gp.player.move.y = -GamePhysics.PL_SPEED; } break; @@ -86,7 +86,14 @@ public class GameInput { break; case Input.Keys.E: - if (CaveGame.STATE == AppState.GAME_PLAY) CaveGame.STATE = AppState.GAME_CREATIVE_INV; + if (CaveGame.STATE == AppState.GAME_PLAY) switch (gp.player.gameMode) { + case 0: + //TODO survival inv + break; + case 1: + CaveGame.STATE = AppState.GAME_CREATIVE_INV; + break; + } else CaveGame.STATE = AppState.GAME_PLAY; break;