X-Git-Url: http://deadsoftware.ru/gitweb?p=cavedroid.git;a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameInput.java;h=dcc1615667226d96b352a3597160f1fdf4cc6def;hp=bef9b558bb2471f848033ddd884f1834c4cdd9b0;hb=4f78d41f9f529d41b23b20128c39d57845ec8298;hpb=cfadf32a4a39d1e437b141b88e103610561ce6ef

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index bef9b55..dcc1615 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
@@ -19,7 +19,7 @@ import static ru.deadsoftware.cavedroid.game.GameItems.*;
 
 public class GameInput {
 
-    private boolean keyDown, touchedDown;
+    private boolean keyDown, touchedDown, dragging;
 
     private int keyDownCode, touchDownBtn;
     private float touchDownX, touchDownY;
@@ -176,9 +176,10 @@ public class GameInput {
     }
 
     private void pressLMB() {
-        if ((GP.world.hasForeAt(curX, curY) && GP.world.getForeMapBlock(curX, curY).getHp() >= 0) ||
+        if (CaveGame.GAME_STATE == GameState.PLAY &&
+                ((GP.world.hasForeAt(curX, curY) && GP.world.getForeMapBlock(curX, curY).getHp() >= 0) ||
                 (!GP.world.hasForeAt(curX, curY) && GP.world.hasBackAt(curX, curY) &&
-                        GP.world.getBackMapBlock(curX, curY).getHp() >= 0)) {
+                        GP.world.getBackMapBlock(curX, curY).getHp() >= 0))) {
             if (GP.player.gameMode == 0) {
                 blockDamage++;
                 if (GP.world.hasForeAt(curX, curY)) {
@@ -313,6 +314,11 @@ public class GameInput {
     }
 
     public void touchUp(float screenX, float screenY, int button) {
+        if (dragging) {
+            dragging = false;
+            return;
+        }
+
         if (CaveGame.TOUCH && keyDown) {
             keyUp(keyDownCode);
             keyDown = false;
@@ -348,6 +354,7 @@ public class GameInput {
     }
 
     public void touchDragged(float screenX, float screenY) {
+        dragging = true;
         if (CaveGame.GAME_STATE == GameState.CREATIVE_INV && Math.abs(screenY - touchDownY) > 16) {
             if (insideCreativeInv(screenX, screenY)) {
                 creativeScroll -= (screenY - touchDownY) / 16;