Add inventory bar

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / game / GameInputHandler.java

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
index c3aa564c9b25c0ad45c104eaa6e0effe537db918..d63568cb1dad36a1cfd5bd16d310e6fe43297657 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
@@ -20,7 +20,8 @@ public class GameInputHandler {
             gameProc.player.moveX.add(GamePhysics.PL_SPEED,0);
             gameProc.player.dir = 1;
         }
-        if (keyCode == Input.Keys.UP) gameProc.player.moveY.add(0,-12);
+        if (keyCode == Input.Keys.UP &&
+                gameProc.player.canJump) gameProc.player.moveY.add(0,-8);
     }
 
     public void keyUp(int keyCode) {
@@ -53,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);
@@ -66,11 +68,17 @@ public class GameInputHandler {
     }
 
     public void touchDragged(int screenX, int screenY) {
-        gameProc.renderer.camera.position.x += (gameProc.touchDownX-screenX);
+        /*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;
+        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;
     }
 
 }