X-Git-Url: https://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameInput.java;h=8bfea89aad345ff07b257dba81527c258858bc2e;hp=2b9e1ddb2486ba3c6743e1ff251a3ffb1e30fed7;hb=99a56427db13dd0ecd025e433a438b77245cb739;hpb=b651af0014451661858adf2c0fa3b4ecb4d3d4db

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
index 2b9e1dd..8bfea89 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
@@ -20,18 +20,25 @@ public class GameInput {
         return GameItems.isFluid(gp.world.getForeMap(gp.player.getMapX(), gp.player.getMapY()));
     }
 
+    private boolean insideCreativeInv(int screenX, int screenY) {
+        return (screenX > gp.renderer.getWidth() / 2 - Assets.creativeInv.getRegionWidth() / 2 &&
+                screenX < gp.renderer.getWidth() / 2 + Assets.creativeInv.getRegionWidth() / 2 &&
+                screenY > gp.renderer.getHeight() / 2 - Assets.creativeInv.getRegionHeight() / 2 &&
+                screenY < gp.renderer.getHeight() / 2 + Assets.creativeInv.getRegionHeight() / 2);
+    }
+
     private void wasdPressed(int keycode) {
         if (gp.ctrlMode == 0 || !CaveGame.TOUCH) {
             switch (keycode) {
                 case Input.Keys.A:
                     gp.player.mov.x = -GamePhysics.PL_SPEED;
                     gp.player.setDir(0);
-                    if (CaveGame.TOUCH && checkSwim()) gp.swim = true;
+                    if (CaveGame.TOUCH && checkSwim()) gp.player.swim = true;
                     break;
                 case Input.Keys.D:
                     gp.player.mov.x = GamePhysics.PL_SPEED;
                     gp.player.setDir(1);
-                    if (CaveGame.TOUCH && checkSwim()) gp.swim = true;
+                    if (CaveGame.TOUCH && checkSwim()) gp.player.swim = true;
                     break;
             }
         } else {
@@ -69,7 +76,7 @@ public class GameInput {
 
             case Input.Keys.SPACE:
                 if (checkSwim()) {
-                    gp.swim = true;
+                    gp.player.swim = true;
                 } else if (gp.player.canJump) {
                     gp.player.mov.add(0, -7);
                 } else if (!gp.player.flyMode && gp.player.gameMode == 1) {
@@ -116,20 +123,17 @@ public class GameInput {
             case Input.Keys.A:
             case Input.Keys.D:
                 gp.player.mov.x = 0;
-                if (CaveGame.TOUCH && gp.swim) gp.swim = false;
+                if (CaveGame.TOUCH && gp.player.swim) gp.player.swim = false;
                 break;
 
             case Input.Keys.SPACE:
             case Input.Keys.CONTROL_LEFT:
                 if (gp.player.flyMode) gp.player.mov.y = 0;
-                if (gp.swim) gp.swim = false;
+                if (gp.player.swim) gp.player.swim = false;
                 break;
         }
     }
 
-    public void mouseMoved(int screenX, int screenY) {
-    }
-
     public void touchDown(int screenX, int screenY, int button) {
         gp.touchDownTime = TimeUtils.millis();
         gp.isTouchDown = true;
@@ -144,11 +148,7 @@ public class GameInput {
             gp.isKeyDown = false;
         }
         if (gp.isTouchDown) {
-            if (CaveGame.STATE == AppState.GAME_CREATIVE_INV &&
-                    screenX > gp.renderer.getWidth() / 2 - Assets.creativeInv.getRegionWidth() / 2 &&
-                    screenX < gp.renderer.getWidth() / 2 + Assets.creativeInv.getRegionWidth() / 2 &&
-                    screenY > gp.renderer.getHeight() / 2 - Assets.creativeInv.getRegionHeight() / 2 &&
-                    screenY < gp.renderer.getHeight() / 2 + Assets.creativeInv.getRegionHeight() / 2) {
+            if (CaveGame.STATE == AppState.GAME_CREATIVE_INV && insideCreativeInv(screenX, screenY)) {
                 int ix = (int) (screenX - (gp.renderer.getWidth() / 2 - Assets.creativeInv.getRegionWidth() / 2 + 8)) / 18;
                 int iy = (int) (screenY - (gp.renderer.getHeight() / 2 - Assets.creativeInv.getRegionHeight() / 2 + 18)) / 18;
                 int item = gp.creativeScroll * 8 + (ix + iy * 8);
@@ -164,10 +164,10 @@ public class GameInput {
             } else if (screenY < Assets.invBar.getRegionHeight() &&
                     screenX > gp.renderer.getWidth() / 2 - Assets.invBar.getRegionWidth() / 2 &&
                     screenX < gp.renderer.getWidth() / 2 + Assets.invBar.getRegionWidth() / 2) {
-                gp.slot = (int) ((screenX - (gp.renderer.getWidth() / 2 - Assets.invBar.getRegionWidth() / 2)) / 20);
+                gp.player.invSlot = (int) ((screenX - (gp.renderer.getWidth() / 2 - Assets.invBar.getRegionWidth() / 2)) / 20);
             } else if (button == Input.Buttons.RIGHT) {
                 gp.useItem(gp.curX, gp.curY,
-                        gp.player.inv[gp.slot], false);
+                        gp.player.inv[gp.player.invSlot], false);
             } else if (button == Input.Buttons.LEFT) {
                 gp.blockDmg = 0;
             }
@@ -177,10 +177,7 @@ public class GameInput {
 
     public void touchDragged(int screenX, int screenY) {
         if (CaveGame.STATE == AppState.GAME_CREATIVE_INV && Math.abs(screenY - gp.touchDownY) > 16) {
-            if (screenX > gp.renderer.getWidth() / 2 - Assets.creativeInv.getRegionWidth() / 2 &&
-                    screenX < gp.renderer.getWidth() / 2 + Assets.creativeInv.getRegionWidth() / 2 &&
-                    screenY > gp.renderer.getHeight() / 2 - Assets.creativeInv.getRegionHeight() / 2 &&
-                    screenY < gp.renderer.getHeight() / 2 + Assets.creativeInv.getRegionHeight() / 2) {
+            if (insideCreativeInv(screenX, screenY)) {
                 gp.creativeScroll -= (screenY - gp.touchDownY) / 16;
                 gp.touchDownX = screenX;
                 gp.touchDownY = screenY;
@@ -194,9 +191,9 @@ public class GameInput {
     public void scrolled(int amount) {
         switch (CaveGame.STATE) {
             case GAME_PLAY:
-                gp.slot += amount;
-                if (gp.slot < 0) gp.slot = 8;
-                if (gp.slot > 8) gp.slot = 0;
+                gp.player.invSlot += amount;
+                if (gp.player.invSlot < 0) gp.player.invSlot = 8;
+                if (gp.player.invSlot > 8) gp.player.invSlot = 0;
                 break;
             case GAME_CREATIVE_INV:
                 gp.creativeScroll += amount;