Fix bugs

[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 490960b8986efffa5c4a24a81b1ef55136a0b65a..dc19afdb0f42a6bd207fe3fc04956f274e85fb54 100644 (file)
--- a/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameInputHandler.java
@@ -3,9 +3,7 @@ package ru.deadsoftware.cavecraft.game;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.utils.TimeUtils;
-import ru.deadsoftware.cavecraft.Assets;
-import ru.deadsoftware.cavecraft.GameScreen;
-import ru.deadsoftware.cavecraft.Items;
+import ru.deadsoftware.cavecraft.*;
 
 public class GameInputHandler {
 
@@ -15,20 +13,20 @@ public class GameInputHandler {
         this.gameProc = gameProc;
     }
 
-    private void wasdPressed(int keyCode) {
-        if (gameProc.ctrlMode==0) {
-            switch (keyCode) {
+    private void wasdPressed(int keycode) {
+        if (gameProc.ctrlMode==0 || !CaveGame.TOUCH) {
+            switch (keycode) {
                 case Input.Keys.A:
-                    gameProc.player.moveX.add(-GamePhysics.PL_SPEED, 0);
+                    gameProc.player.moveX.x = -GamePhysics.PL_SPEED;
                     gameProc.player.dir = 0;
                     break;
                 case Input.Keys.D:
-                    gameProc.player.moveX.add(GamePhysics.PL_SPEED, 0);
+                    gameProc.player.moveX.x = GamePhysics.PL_SPEED;
                     gameProc.player.dir = 1;
                     break;
             }
-        } else {
-            switch (keyCode) {
+        } else if (CaveGame.TOUCH){
+            switch (keycode) {
                 case Input.Keys.A:
                     gameProc.cursorX--;
                     break;
@@ -42,27 +40,21 @@ public class GameInputHandler {
                     gameProc.cursorY++;
                     break;
             }
-            if (gameProc.cursorX < 0)
-                gameProc.cursorX = 0;
-            if (gameProc.cursorX >= gameProc.world.getWidth())
-                gameProc.cursorX = gameProc.world.getWidth()-1;
-            if (gameProc.cursorY < 0)
-                gameProc.cursorY = 0;
-            if (gameProc.cursorY >= gameProc.world.getHeight())
-                gameProc.cursorY = gameProc.world.getHeight()-1;
         }
     }
 
-    public void  keyDown(int keyCode) {
-        if (keyCode == Input.Keys.W || keyCode == Input.Keys.A ||
-                keyCode == Input.Keys.S || keyCode == Input.Keys.D) {
-            wasdPressed(keyCode);
-        } else switch (keyCode) {
+    public void  keyDown(int keycode) {
+        gameProc.isKeyDown = true;
+        gameProc.keyDownCode = keycode;
+        if (keycode == Input.Keys.W || keycode == Input.Keys.A ||
+                keycode == Input.Keys.S || keycode == Input.Keys.D) {
+            wasdPressed(keycode);
+        } else switch (keycode) {
             case Input.Keys.ALT_LEFT:
-                gameProc.ctrlMode++;
-                gameProc.cursorX = (int)(gameProc.player.position.x/16);
-                gameProc.cursorY = (int)(gameProc.player.position.y/16);
-                if (gameProc.ctrlMode > 1) gameProc.ctrlMode = 0;
+                if (CaveGame.TOUCH) {
+                    gameProc.ctrlMode++;
+                    if (gameProc.ctrlMode > 1) gameProc.ctrlMode = 0;
+                }
                 break;
 
             case Input.Keys.SPACE:
@@ -81,13 +73,17 @@ public class GameInputHandler {
                 break;
 
             case Input.Keys.E:
-                gameProc.renderer.showCreative = !gameProc.renderer.showCreative;
+                if (CaveGame.STATE == GameState.GAME_PLAY) CaveGame.STATE = GameState.GAME_CREATIVE_INV;
+                    else CaveGame.STATE = GameState.GAME_PLAY;
                 break;
+
+            case Input.Keys.N:
+                CaveGame.STATE = GameState.RESTART;
         }
     }
 
-    public void keyUp(int keyCode) {
-        switch (keyCode) {
+    public void keyUp(int keycode) {
+        switch (keycode) {
             case Input.Keys.A: case Input.Keys.D:
                 gameProc.player.moveX.x = 0;
                 break;
@@ -102,24 +98,22 @@ public class GameInputHandler {
     }
 
     public void touchDown(int screenX, int screenY, int button) {
-        if (gameProc.renderer.showCreative &&
+        if (CaveGame.STATE == GameState.GAME_CREATIVE_INV &&
                 screenX>gameProc.renderer.camera.viewportWidth/2-Assets.creativeInv.getRegionWidth()/2 &&
                 screenX<gameProc.renderer.camera.viewportWidth/2+Assets.creativeInv.getRegionWidth()/2 &&
                 screenY>gameProc.renderer.camera.viewportHeight/2-Assets.creativeInv.getRegionHeight()/2 &&
                 screenY<gameProc.renderer.camera.viewportHeight/2+Assets.creativeInv.getRegionHeight()/2) {
-            try {
-                int ix = (int) (screenX - (gameProc.renderer.camera.viewportWidth / 2 - Assets.creativeInv.getRegionWidth() / 2 + 8)) / 18;
-                int iy = (int) (screenY - (gameProc.renderer.camera.viewportHeight / 2 - Assets.creativeInv.getRegionHeight() / 2 + 18)) / 18;
-                int item = ix + iy * 8;
+            int ix = (int) (screenX - (gameProc.renderer.camera.viewportWidth / 2 - Assets.creativeInv.getRegionWidth() / 2 + 8)) / 18;
+            int iy = (int) (screenY - (gameProc.renderer.camera.viewportHeight / 2 - Assets.creativeInv.getRegionHeight() / 2 + 18)) / 18;
+            int item = ix + iy * 8;
+            if (item >= 0 && item < Items.BLOCKS.size) {
                 for (int i = 8; i > 0; i--) {
                     gameProc.player.inventory[i] = gameProc.player.inventory[i - 1];
                 }
-                if (item >= 0 && item < Items.BLOCKS.size) gameProc.player.inventory[0] = item;
-            } catch (Exception e) {
-                Gdx.app.error("GameInputHandler", e.toString());
+                gameProc.player.inventory[0] = item;
             }
-        } else if (gameProc.renderer.showCreative) {
-            gameProc.renderer.showCreative = !gameProc.renderer.showCreative;
+        } else if (CaveGame.STATE == GameState.GAME_CREATIVE_INV) {
+            CaveGame.STATE = GameState.GAME_PLAY;
         } else {
             gameProc.touchDownX = screenX;
             gameProc.touchDownY = screenY;
@@ -130,26 +124,25 @@ public class GameInputHandler {
     }
 
     public void touchUp(int screenX, int screenY, int button) {
+        if (gameProc.isKeyDown) {
+            keyUp(gameProc.keyDownCode);
+            gameProc.isKeyDown = false;
+        }
         if (gameProc.isTouchDown) {
             if (button == Input.Buttons.RIGHT){
-                if (gameProc.ctrlMode==1) {
-                    gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY,
+                gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY,
                             gameProc.player.inventory[gameProc.invSlot]);
-                }
             } else if (button == Input.Buttons.LEFT) {
-                if (gameProc.ctrlMode==1) {
-                    if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY) > 0) {
-                        gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY, 0);
-                    } else if (gameProc.world.getBackMap(gameProc.cursorX, gameProc.cursorY) > 0) {
-                        gameProc.world.placeToBackground(gameProc.cursorX, gameProc.cursorY, 0);
-                    }
-                } else {
-                    if (screenY<Assets.invBar.getRegionHeight() &&
-                            screenX>gameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2 &&
-                            screenX<gameProc.renderer.camera.viewportWidth/2+Assets.invBar.getRegionWidth()/2) {
-                        gameProc.invSlot = (int)((screenX-(gameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2))/20);
-                    }
+                if (screenY<Assets.invBar.getRegionHeight() &&
+                        screenX>gameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2 &&
+                        screenX<gameProc.renderer.camera.viewportWidth/2+Assets.invBar.getRegionWidth()/2) {
+                    gameProc.invSlot = (int)((screenX-(gameProc.renderer.camera.viewportWidth/2-Assets.invBar.getRegionWidth()/2))/20);
+                } else if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY) > 0) {
+                    gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY, 0);
+                } else if (gameProc.world.getBackMap(gameProc.cursorX, gameProc.cursorY) > 0) {
+                    gameProc.world.placeToBackground(gameProc.cursorX, gameProc.cursorY, 0);
                 }
+
             }
         }
         gameProc.isTouchDown = false;