X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameInput.java;h=7a66d9949b223771e0fb321f87c220fe981dafe8;hb=7f1f702250f9cd05c1d7f5492e09ba16a56270ae;hp=d151ec6b3279ffae07fc3e1e279e72cf3bb3e0be;hpb=75e8bbe4c9dceaabd8bb7e7976ad9052cfb0a968;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
index d151ec6..7a66d99 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
@@ -17,16 +17,23 @@ public class GameInput {
         this.gameProc = gameProc;
     }
 
+    private boolean checkSwim() {
+        return (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) {
                 case Input.Keys.A:
                     gameProc.player.moveX.x = -GamePhysics.PL_SPEED;
                     gameProc.player.dir = 0;
+                    if (CaveGame.TOUCH && checkSwim()) gameProc.swim = true;
                     break;
                 case Input.Keys.D:
                     gameProc.player.moveX.x = GamePhysics.PL_SPEED;
                     gameProc.player.dir = 1;
+                    if (CaveGame.TOUCH && checkSwim()) gameProc.swim = true;
                     break;
             }
         } else if (CaveGame.TOUCH){
@@ -62,8 +69,7 @@ public class GameInput {
                 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);
@@ -102,11 +108,12 @@ public class GameInput {
         switch (keycode) {
             case Input.Keys.A: case Input.Keys.D:
                 gameProc.player.moveX.x = 0;
+                if (CaveGame.TOUCH && 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;
         }
     }