Attempt to make more convenient controls

[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / misc / InputHandlerGame.java

diff --git a/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerGame.java b/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerGame.java
index ffc38ccea589e80007e41a40c5c4af664472ef3e..c9de4fab9d1ac38131f30bad3a966f6839c5b5d0 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerGame.java
+++ b/core/src/ru/deadsoftware/cavecraft/misc/InputHandlerGame.java
@@ -65,7 +65,7 @@ public class InputHandlerGame implements InputProcessor {
             } else if (tx > tWidth - 26 && screenY > ty - 26) {
                 gameInput.touchDown(screenX, screenY, Input.Buttons.RIGHT);
             } else {
-                gameInput.touchDown(screenX, screenY, Input.Buttons.LEFT);
+                gameInput.touchDown(screenX, screenY, -1);
             }
         } else {
             gameInput.touchDown(screenX, screenY, button);
@@ -97,7 +97,7 @@ public class InputHandlerGame implements InputProcessor {
             } else if (tx > tWidth - 26 && screenY > ty - 26) {
                 gameInput.touchUp(screenX, screenY, Input.Buttons.RIGHT);
             } else {
-                gameInput.touchUp(screenX, screenY, Input.Buttons.LEFT);
+                gameInput.touchUp(screenX, screenY, -1);
             }
         } else {
             gameInput.touchUp(screenX, screenY, button);
@@ -109,7 +109,11 @@ public class InputHandlerGame implements InputProcessor {
     public boolean touchDragged(int screenX, int screenY, int pointer) {
         screenX *= gameProc.renderer.camera.viewportWidth/getWidth();
         screenY *= gameProc.renderer.camera.viewportHeight/getHeight();
-        gameInput.touchDragged(screenX, screenY);
+        if (gameProc.isKeyDown && (screenX>78 || screenY<gameProc.renderer.getHeight()-52)) {
+            gameInput.keyUp(gameProc.keyDownCode);
+        } else {
+            gameInput.touchDragged(screenX, screenY);
+        }
         return false;
     }