X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameInputHandler.java;h=899fbba6f06578dd4ca66ec47162e596cdc3a231;hb=472a7548653e0660f3f9ff1d47b03f81ccc97ccd;hp=26b4b6acdc9bfba26fd494d123ef7929c0ffcab2;hpb=7895e461428b3cd6db4c606373081f063a9e0a2b;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
index 26b4b6a..899fbba 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
@@ -12,20 +12,20 @@ public class GameInputHandler {
     }
 
     public void  keyDown(int keyCode) {
-        if (keyCode == Input.Keys.LEFT) {
+        if (keyCode == Input.Keys.A) {
             gameProc.player.moveX.add(-GamePhysics.PL_SPEED,0);
             gameProc.player.dir = 0;
         }
-        if (keyCode == Input.Keys.RIGHT) {
+        if (keyCode == Input.Keys.D) {
             gameProc.player.moveX.add(GamePhysics.PL_SPEED,0);
             gameProc.player.dir = 1;
         }
-        if (keyCode == Input.Keys.UP &&
+        if (keyCode == Input.Keys.SPACE &&
                 gameProc.player.canJump) gameProc.player.moveY.add(0,-8);
     }
 
     public void keyUp(int keyCode) {
-        if (keyCode == Input.Keys.RIGHT || keyCode == Input.Keys.LEFT) {
+        if (keyCode == Input.Keys.A || keyCode == Input.Keys.D) {
             gameProc.player.moveX.x = 0;
         }
     }
@@ -54,7 +54,8 @@ public class GameInputHandler {
     public void touchUp(int screenX, int screenY, int button) {
         if (gameProc.isTouchDown) {
             if (button == Input.Buttons.RIGHT){
-                gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY, 1);
+                gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY,
+                        gameProc.player.inventory[gameProc.invSlot]);
             } else if (button == Input.Buttons.LEFT) {
                 if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY) > 0) {
                     gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY, 0);
@@ -67,11 +68,12 @@ public class GameInputHandler {
     }
 
     public void touchDragged(int screenX, int screenY) {
-        gameProc.renderer.camera.position.x += (gameProc.touchDownX-screenX);
-        gameProc.renderer.camera.position.y += (gameProc.touchDownY-screenY);
-        gameProc.touchDownX = screenX;
-        gameProc.touchDownY = screenY;
-        gameProc.isTouchDown = false;
+    }
+
+    public void scrolled(int amount) {
+        gameProc.invSlot += amount;
+        if (gameProc.invSlot < 0) gameProc.invSlot = 8;
+        if (gameProc.invSlot > 8) gameProc.invSlot = 0;
     }
 
 }