upgrade dependencies and gradle

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / GameInput.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
index 3a5e3c4ff47044665b0d69cac4384f0c7bd7072c..594f8cc64d16df74b1c1dca1b7f032ad1a6b1be7 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameInput.java
@@ -10,6 +10,7 @@ import ru.deadsoftware.cavedroid.game.mobs.Mob;
 import ru.deadsoftware.cavedroid.game.mobs.MobsController;
 import ru.deadsoftware.cavedroid.game.mobs.Pig;
 import ru.deadsoftware.cavedroid.game.mobs.Player;
+import ru.deadsoftware.cavedroid.game.objects.DropController;
 import ru.deadsoftware.cavedroid.misc.Assets;
 import ru.deadsoftware.cavedroid.misc.ControlMode;
 
@@ -22,6 +23,7 @@ public class GameInput {
 
     private final MainConfig mMainConfig;
     private final GameWorld mGameWorld;
+    private final DropController mDropController;
     private final MobsController mMobsController;
     private final Player mPlayer;
 
@@ -45,9 +47,11 @@ public class GameInput {
     @Inject
     public GameInput(MainConfig mainConfig,
                      GameWorld gameWorld,
+                     DropController dropController,
                      MobsController mobsController) {
         mMainConfig = mainConfig;
         mGameWorld = gameWorld;
+        mDropController = dropController;
         mMobsController = mobsController;
 
         mPlayer = mMobsController.getPlayer();
@@ -243,7 +247,7 @@ public class GameInput {
             mTouchedDown = false;
         } else {
             if (insideHotbar(mTouchDownX, mTouchDownY)) {
-//                CaveGame.GAME_STATE = GameState.CREATIVE_INV;
+                mMainConfig.setGameUiWindow(GameUiWindow.CREATIVE_INVENTORY);
                 mTouchedDown = false;
             }
         }
@@ -291,11 +295,11 @@ public class GameInput {
                 mGameWorld.placeToForeground(mCurX, mCurY, 8);
                 break;
 
-//            case Input.Keys.ESCAPE:
-//            case Input.Keys.BACK:
-//                CaveGame.APP_STATE = AppState.SAVE;
-//                CaveGame.GAME_STATE = GameState.PAUSE;
-//                break;
+            case Input.Keys.ESCAPE:
+            case Input.Keys.BACK:
+                GameSaver.save(mMainConfig, mDropController, mMobsController, mGameWorld);
+                mMainConfig.getCaveGame().quitGame();
+                break;
 
             case Input.Keys.F1:
                 mMainConfig.setShowInfo(!mMainConfig.isShowInfo());
@@ -396,10 +400,10 @@ public class GameInput {
         }
     }
 
-    public void scrolled(int amount) {
+    public void scrolled(float amountX, float amountY) {
         switch (mMainConfig.getGameUiWindow()) {
             case NONE:
-                mPlayer.slot += amount;
+                mPlayer.slot += (int) amountY;
                 if (mPlayer.slot < 0) {
                     mPlayer.slot = 8;
                 }
@@ -408,7 +412,7 @@ public class GameInput {
                 }
                 break;
             case CREATIVE_INVENTORY:
-                mCreativeScroll += amount;
+                mCreativeScroll += (int) amountY;
                 if (mCreativeScroll < 0) {
                     mCreativeScroll = 0;
                 }