X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameInput.java;h=672c4c957c95eff7129ab2a375e41dd342fa8201;hb=7370b011158c7f9a1216dbf76de5acd9d277b7e9;hp=2e54ad3ee1f29f921b34331a45593ce4255f82cd;hpb=597ab66d10b43233da31893d0d074485d5aa0bd2;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
index 2e54ad3..672c4c9 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
@@ -3,6 +3,8 @@ package ru.deadsoftware.cavecraft.game;
 import com.badlogic.gdx.Input;
 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;
@@ -15,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){
@@ -60,7 +69,9 @@ public class GameInput {
                 break;
 
             case Input.Keys.SPACE:
-                if (gameProc.player.canJump) {
+                if (checkSwim()) {
+                    gameProc.swim = true;
+                } else if (gameProc.player.canJump) {
                     gameProc.player.moveY.add(0, -7);
                 } else if (!gameProc.player.flyMode) {
                     gameProc.player.flyMode = true;
@@ -86,6 +97,10 @@ public class GameInput {
             case Input.Keys.ESCAPE: case Input.Keys.BACK:
                 CaveGame.STATE = AppState.GOTO_MENU;
                 break;
+
+            case Input.Keys.F1:
+                GameScreen.SHOW_DEBUG = !GameScreen.SHOW_DEBUG;
+                break;
         }
     }
 
@@ -93,10 +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();
+                if (gameProc.swim) gameProc.swim = false;
                 break;
         }
     }
@@ -105,46 +122,45 @@ public class GameInput {
     }
 
     public void touchDown(int screenX, int screenY, int button) {
-        if (CaveGame.STATE == AppState.GAME_CREATIVE_INV &&
-                screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 &&
-                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) {
-            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 = gameProc.creativeScroll*40+(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];
-                }
-                gameProc.player.inventory[0] = item;
-            }
-        } else if (CaveGame.STATE == AppState.GAME_CREATIVE_INV) {
-            CaveGame.STATE = AppState.GAME_PLAY;
-        } else {
-            gameProc.touchDownTime = TimeUtils.millis();
-            gameProc.isTouchDown = true;
-            gameProc.touchDownButton = button;
-        }
+        gameProc.touchDownTime = TimeUtils.millis();
+        gameProc.isTouchDown = true;
+        gameProc.touchDownButton = button;
         gameProc.touchDownX = screenX;
         gameProc.touchDownY = screenY;
     }
 
     public void touchUp(int screenX, int screenY, int button) {
-        if (gameProc.isKeyDown) {
+        if (CaveGame.TOUCH && gameProc.isKeyDown) {
             keyUp(gameProc.keyDownCode);
             gameProc.isKeyDown = false;
         }
         if (gameProc.isTouchDown) {
-            if (button == Input.Buttons.RIGHT){
-                gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY,
-                            gameProc.player.inventory[gameProc.invSlot]);
+            if (CaveGame.STATE == AppState.GAME_CREATIVE_INV &&
+                    screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 &&
+                    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) {
+                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 = gameProc.creativeScroll*8+(ix + iy * 8);
+                if (ix>=8 || ix<0 || iy<0 || iy>=5) item=-1;
+                if (item >= 0 && item < Items.ITEMS.size()) {
+                    for (int i = 8; i > 0; i--) {
+                        gameProc.player.inventory[i] = gameProc.player.inventory[i - 1];
+                    }
+                    gameProc.player.inventory[0] = item;
+                }
+            } else if (CaveGame.STATE == AppState.GAME_CREATIVE_INV) {
+                CaveGame.STATE = AppState.GAME_PLAY;
+            } else if (screenY<Assets.invBar.getRegionHeight() &&
+                    screenX>gameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2 &&
+                    screenX<gameProc.renderer.camera.viewportWidth/2+Assets.invBar.getRegionWidth()/2) {
+                gameProc.invSlot = (int)((screenX-(gameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2))/20);
+            } else if (button == Input.Buttons.RIGHT){
+                gameProc.useItem(gameProc.cursorX, gameProc.cursorY,
+                            gameProc.player.inventory[gameProc.invSlot], false);
             } else if (button == Input.Buttons.LEFT) {
-                if (screenY<Assets.invBar.getRegionHeight() &&
-                        screenX>gameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2 &&
-                        screenX<gameProc.renderer.camera.viewportWidth/2+Assets.invBar.getRegionWidth()/2) {
-                    gameProc.invSlot = (int)((screenX-(gameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2))/20);
-                } else if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY) > 0) {
+                if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY) > 0) {
                     gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY, 0);
                 } else if (gameProc.world.getBackMap(gameProc.cursorX, gameProc.cursorY) > 0) {
                     gameProc.world.placeToBackground(gameProc.cursorX, gameProc.cursorY, 0);
@@ -157,12 +173,17 @@ public class GameInput {
 
     public void touchDragged(int screenX, int screenY) {
         if (CaveGame.STATE == AppState.GAME_CREATIVE_INV && Math.abs(screenY-gameProc.touchDownY)>16) {
-                gameProc.creativeScroll+=(screenY-gameProc.touchDownY)/16;
+            if (screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 &&
+                    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) {
+                gameProc.creativeScroll -= (screenY - gameProc.touchDownY) / 16;
                 gameProc.touchDownX = screenX;
                 gameProc.touchDownY = screenY;
-                if (gameProc.creativeScroll<0) gameProc.creativeScroll=0;
-                if (gameProc.creativeScroll>gameProc.maxCreativeScroll)
-                    gameProc.creativeScroll=gameProc.maxCreativeScroll;
+                if (gameProc.creativeScroll < 0) gameProc.creativeScroll = 0;
+                if (gameProc.creativeScroll > gameProc.maxCreativeScroll)
+                    gameProc.creativeScroll = gameProc.maxCreativeScroll;
+            }
         }
     }