diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
index e44e0053376122e474bda26fe04002fbadea1484..d151ec6b3279ffae07fc3e1e279e72cf3bb3e0be 100644 (file)
import com.badlogic.gdx.utils.TimeUtils;
import ru.deadsoftware.cavecraft.CaveGame;
import ru.deadsoftware.cavecraft.GameScreen;
+import ru.deadsoftware.cavecraft.game.mobs.FallingSand;
import ru.deadsoftware.cavecraft.game.mobs.Pig;
import ru.deadsoftware.cavecraft.misc.AppState;
import ru.deadsoftware.cavecraft.misc.Assets;
break;
case Input.Keys.SPACE:
- if (gameProc.player.canJump) {
+ 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))) {
+ gameProc.swim = true;
+ } else if (gameProc.player.canJump) {
gameProc.player.moveY.add(0, -7);
} else if (!gameProc.player.flyMode) {
gameProc.player.flyMode = true;
case Input.Keys.SPACE: case Input.Keys.CONTROL_LEFT:
if (gameProc.player.flyMode) gameProc.player.moveY.setZero();
+ gameProc.swim = false;
break;
}
}
}
public void touchUp(int screenX, int screenY, int button) {
- if (gameProc.isKeyDown) {
+ if (CaveGame.TOUCH && gameProc.isKeyDown) {
keyUp(gameProc.keyDownCode);
gameProc.isKeyDown = false;
}