DEADSOFTWARE

Fix bugs
[cavedroid.git] / core / src / ru / deadsoftware / cavecraft / game / GameInputHandler.java
index 0b714ddd43eda90fa210a60108f592d79ece325e..dc19afdb0f42a6bd207fe3fc04956f274e85fb54 100644 (file)
@@ -1,8 +1,9 @@
 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.GameScreen;
+import ru.deadsoftware.cavecraft.*;
 
 public class GameInputHandler {
 
@@ -12,68 +13,84 @@ public class GameInputHandler {
         this.gameProc = gameProc;
     }
 
-    public void  keyDown(int keyCode) {
-        if (gameProc.ctrlMode==0) {
-            if (keyCode == Input.Keys.A) {
-                gameProc.player.moveX.add(-GamePhysics.PL_SPEED, 0);
-                gameProc.player.dir = 0;
+    private void wasdPressed(int keycode) {
+        if (gameProc.ctrlMode==0 || !CaveGame.TOUCH) {
+            switch (keycode) {
+                case Input.Keys.A:
+                    gameProc.player.moveX.x = -GamePhysics.PL_SPEED;
+                    gameProc.player.dir = 0;
+                    break;
+                case Input.Keys.D:
+                    gameProc.player.moveX.x = GamePhysics.PL_SPEED;
+                    gameProc.player.dir = 1;
+                    break;
             }
-            if (keyCode == Input.Keys.D) {
-                gameProc.player.moveX.add(GamePhysics.PL_SPEED, 0);
-                gameProc.player.dir = 1;
+        } else if (CaveGame.TOUCH){
+            switch (keycode) {
+                case Input.Keys.A:
+                    gameProc.cursorX--;
+                    break;
+                case Input.Keys.D:
+                    gameProc.cursorX++;
+                    break;
+                case Input.Keys.W:
+                    gameProc.cursorY--;
+                    break;
+                case Input.Keys.S:
+                    gameProc.cursorY++;
+                    break;
             }
-        } else {
-            if (keyCode == Input.Keys.A) {
-                gameProc.cursorX--;
-            }
-            if (keyCode == Input.Keys.D) {
-                gameProc.cursorX++;
-            }
-            if (keyCode == Input.Keys.W) {
-                gameProc.cursorY--;
-            }
-            if (keyCode == Input.Keys.S) {
-                gameProc.cursorY++;
-            }
-            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;
-        }
-        if (keyCode == 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 (keyCode == Input.Keys.SPACE) {
-             if (gameProc.player.canJump) {
-                 gameProc.player.moveY.add(0, -7);
-             } else if (!gameProc.player.flyMode) {
-                 gameProc.player.flyMode = true;
-                 gameProc.player.moveY.setZero();
-             } else {
-                 gameProc.player.moveY.y = -GamePhysics.PL_SPEED;
-             }
-        }
-        if (keyCode == Input.Keys.CONTROL_LEFT) {
-            gameProc.player.moveY.y = GamePhysics.PL_SPEED;
         }
     }
 
-    public void keyUp(int keyCode) {
-        if (keyCode == Input.Keys.A || keyCode == Input.Keys.D) {
-            gameProc.player.moveX.x = 0;
-        }
-        if (keyCode == Input.Keys.SPACE) {
-            if (gameProc.player.flyMode) gameProc.player.moveY.setZero();
+    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:
+                if (CaveGame.TOUCH) {
+                    gameProc.ctrlMode++;
+                    if (gameProc.ctrlMode > 1) gameProc.ctrlMode = 0;
+                }
+                break;
+
+            case Input.Keys.SPACE:
+                if (gameProc.player.canJump) {
+                    gameProc.player.moveY.add(0, -7);
+                } else if (!gameProc.player.flyMode) {
+                    gameProc.player.flyMode = true;
+                    gameProc.player.moveY.setZero();
+                } else {
+                    gameProc.player.moveY.y = -GamePhysics.PL_SPEED;
+                }
+                break;
+
+            case Input.Keys.CONTROL_LEFT:
+                gameProc.player.moveY.y = GamePhysics.PL_SPEED;
+                break;
+
+            case Input.Keys.E:
+                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;
         }
-        if (keyCode == Input.Keys.CONTROL_LEFT) {
-            if (gameProc.player.flyMode) gameProc.player.moveY.setZero();
+    }
+
+    public void keyUp(int keycode) {
+        switch (keycode) {
+            case Input.Keys.A: case Input.Keys.D:
+                gameProc.player.moveX.x = 0;
+                break;
+
+            case Input.Keys.SPACE: case Input.Keys.CONTROL_LEFT:
+                if (gameProc.player.flyMode) gameProc.player.moveY.setZero();
+                break;
         }
     }
 
@@ -81,23 +98,51 @@ public class GameInputHandler {
     }
 
     public void touchDown(int screenX, int screenY, int button) {
-        gameProc.touchDownX = screenX;
-        gameProc.touchDownY = screenY;
-        gameProc.touchDownTime = TimeUtils.millis();
-        gameProc.isTouchDown = true;
+        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) {
+            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];
+                }
+                gameProc.player.inventory[0] = item;
+            }
+        } else if (CaveGame.STATE == GameState.GAME_CREATIVE_INV) {
+            CaveGame.STATE = GameState.GAME_PLAY;
+        } else {
+            gameProc.touchDownX = screenX;
+            gameProc.touchDownY = screenY;
+            gameProc.touchDownTime = TimeUtils.millis();
+            gameProc.isTouchDown = true;
+            gameProc.touchDownButton = button;
+        }
     }
 
     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){
                 gameProc.world.placeToForeground(gameProc.cursorX, gameProc.cursorY,
-                        gameProc.player.inventory[gameProc.invSlot]);
+                            gameProc.player.inventory[gameProc.invSlot]);
             } else if (button == Input.Buttons.LEFT) {
-                if (gameProc.world.getForeMap(gameProc.cursorX, gameProc.cursorY) > 0) {
+                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;