X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavecraft%2Fgame%2FGameInput.java;h=2e54ad3ee1f29f921b34331a45593ce4255f82cd;hb=597ab66d10b43233da31893d0d074485d5aa0bd2;hp=10e0e43f0047bad021e6f5b29120b8afc38f6586;hpb=d1510d8504e14edc4b21ded60c8b5f0b910806c2;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
index 10e0e43..2e54ad3 100644
--- a/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
+++ b/core/src/ru/deadsoftware/cavecraft/game/GameInput.java
@@ -2,8 +2,10 @@ package ru.deadsoftware.cavecraft.game;
 
 import com.badlogic.gdx.Input;
 import com.badlogic.gdx.utils.TimeUtils;
-import ru.deadsoftware.cavecraft.*;
-import ru.deadsoftware.cavecraft.AppState;
+import ru.deadsoftware.cavecraft.CaveGame;
+import ru.deadsoftware.cavecraft.game.mobs.Pig;
+import ru.deadsoftware.cavecraft.misc.AppState;
+import ru.deadsoftware.cavecraft.misc.Assets;
 
 public class GameInput {
 
@@ -77,8 +79,8 @@ public class GameInput {
                     else CaveGame.STATE = AppState.GAME_PLAY;
                 break;
 
-            case Input.Keys.N:
-                CaveGame.STATE = AppState.GOTO_GAME;
+            case Input.Keys.G:
+                gameProc.mobs.add(new Pig(gameProc.cursorX*16, gameProc.cursorY*16));
                 break;
 
             case Input.Keys.ESCAPE: case Input.Keys.BACK:
@@ -110,7 +112,7 @@ public class GameInput {
                 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;
+            int item = gameProc.creativeScroll*40+(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];
@@ -120,12 +122,12 @@ public class GameInput {
         } else if (CaveGame.STATE == AppState.GAME_CREATIVE_INV) {
             CaveGame.STATE = AppState.GAME_PLAY;
         } else {
-            gameProc.touchDownX = screenX;
-            gameProc.touchDownY = screenY;
             gameProc.touchDownTime = TimeUtils.millis();
             gameProc.isTouchDown = true;
             gameProc.touchDownButton = button;
         }
+        gameProc.touchDownX = screenX;
+        gameProc.touchDownY = screenY;
     }
 
     public void touchUp(int screenX, int screenY, int button) {
@@ -154,12 +156,30 @@ public class GameInput {
     }
 
     public void touchDragged(int screenX, int screenY) {
+        if (CaveGame.STATE == AppState.GAME_CREATIVE_INV && Math.abs(screenY-gameProc.touchDownY)>16) {
+                gameProc.creativeScroll+=(screenY-gameProc.touchDownY)/16;
+                gameProc.touchDownX = screenX;
+                gameProc.touchDownY = screenY;
+                if (gameProc.creativeScroll<0) gameProc.creativeScroll=0;
+                if (gameProc.creativeScroll>gameProc.maxCreativeScroll)
+                    gameProc.creativeScroll=gameProc.maxCreativeScroll;
+        }
     }
 
     public void scrolled(int amount) {
-        gameProc.invSlot += amount;
-        if (gameProc.invSlot < 0) gameProc.invSlot = 8;
-        if (gameProc.invSlot > 8) gameProc.invSlot = 0;
+        switch (CaveGame.STATE) {
+            case GAME_PLAY:
+                gameProc.invSlot += amount;
+                if (gameProc.invSlot < 0) gameProc.invSlot = 8;
+                if (gameProc.invSlot > 8) gameProc.invSlot = 0;
+                break;
+            case GAME_CREATIVE_INV:
+                gameProc.creativeScroll+=amount;
+                if (gameProc.creativeScroll<0) gameProc.creativeScroll=0;
+                if (gameProc.creativeScroll>gameProc.maxCreativeScroll)
+                    gameProc.creativeScroll=gameProc.maxCreativeScroll;
+                break;
+        }
     }
 
 }