diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
index d151ec6b3279ffae07fc3e1e279e72cf3bb3e0be..c868a8adcb4250bb29c3ccd51127ec6844a3fefb 100644 (file)
this.gameProc = gameProc;
}
+ private boolean checkSwim() {
+ return (CaveGame.TOUCH && Items.isFluid(gameProc.world.getForeMap((int)(gameProc.player.position.x+gameProc.player.width/2)/16,
+ (int)(gameProc.player.position.y+gameProc.player.height/4*3)/16)));
+ }
+
private void wasdPressed(int keycode) {
if (gameProc.ctrlMode==0 || !CaveGame.TOUCH) {
switch (keycode) {
break;
case Input.Keys.SPACE:
- if (Items.isFluid(gameProc.world.getForeMap((int)(gameProc.player.position.x+gameProc.player.width/2)/16,
- (int)(gameProc.player.position.y+gameProc.player.height/4*3)/16))) {
+ if (checkSwim()) {
gameProc.swim = true;
} else if (gameProc.player.canJump) {
gameProc.player.moveY.add(0, -7);
switch (keycode) {
case Input.Keys.A: case Input.Keys.D:
gameProc.player.moveX.x = 0;
+ if (gameProc.swim) gameProc.swim = false;
break;
case Input.Keys.SPACE: case Input.Keys.CONTROL_LEFT:
if (gameProc.player.flyMode) gameProc.player.moveY.setZero();
- gameProc.swim = false;
+ if (gameProc.swim) gameProc.swim = false;
break;
}
}