X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameProc.java;h=29062a44a07d24deff2efcefa40a2ec542a8978a;hb=cb0605053ce3de493b0d1f43cd7ec1e4a9cf0ac5;hp=139a31ba61e8dbe98d54fb458944de45450a35f2;hpb=894d9f1babeff18c9cbb5f83206ff2c549de0bdb;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
index 139a31b..29062a4 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
@@ -1,46 +1,60 @@
 package ru.deadsoftware.cavedroid.game;
 
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.utils.Disposable;
 import com.badlogic.gdx.utils.Timer;
+import ru.deadsoftware.cavedroid.MainConfig;
 import ru.deadsoftware.cavedroid.game.mobs.MobsController;
+import ru.deadsoftware.cavedroid.game.mobs.player.Player;
+import ru.deadsoftware.cavedroid.game.objects.container.ContainerController;
 import ru.deadsoftware.cavedroid.game.world.GameWorldBlocksLogicControllerTask;
 import ru.deadsoftware.cavedroid.game.world.GameWorldFluidsLogicControllerTask;
+import ru.deadsoftware.cavedroid.game.world.GameWorldMobDamageControllerTask;
 
 import javax.inject.Inject;
 
 @GameScope
 public class GameProc implements Disposable {
 
-    public static final int MAX_CREATIVE_SCROLL = GameItems.getItemsSize() / 8;
-
     private final GamePhysics mGamePhysics;
-    private final GameInput mGameInput;
     private final GameRenderer mGameRenderer;
     private final MobsController mMobsController;
+    private final ContainerController mContainerController;
+    private final GameItemsHolder mGameItemsHolder;
     private final GameWorldFluidsLogicControllerTask mGameWorldFluidsLogicControllerTask;
     private final GameWorldBlocksLogicControllerTask mGameWorldBlocksLogicControllerTask;
+    private final GameWorldMobDamageControllerTask mGameWorldMobDamageControllerTask;
 
     private final Timer mWorldLogicTimer = new Timer();
 
     @Inject
-    public GameProc(GamePhysics gamePhysics,
-                    GameInput gameInput,
+    public GameProc(MainConfig mainConfig,
+                    GamePhysics gamePhysics,
                     GameRenderer gameRenderer,
                     MobsController mobsController,
+                    ContainerController containerController,
+                    GameItemsHolder gameItemsHolder,
                     GameWorldFluidsLogicControllerTask gameWorldFluidsLogicControllerTask,
-                    GameWorldBlocksLogicControllerTask gameWorldBlocksLogicControllerTask
+                    GameWorldBlocksLogicControllerTask gameWorldBlocksLogicControllerTask,
+                    GameWorldMobDamageControllerTask gameWorldMobDamageControllerTask
     ) {
         mGamePhysics = gamePhysics;
-        mGameInput = gameInput;
         mGameRenderer = gameRenderer;
         mMobsController = mobsController;
+        mContainerController = containerController;
+        mGameItemsHolder = gameItemsHolder;
         mGameWorldFluidsLogicControllerTask = gameWorldFluidsLogicControllerTask;
         mGameWorldBlocksLogicControllerTask = gameWorldBlocksLogicControllerTask;
+        mGameWorldMobDamageControllerTask = gameWorldMobDamageControllerTask;
+
+        mobsController.getPlayer().controlMode = mainConfig.isTouch() ? Player.ControlMode.WALK : Player.ControlMode.CURSOR;
 
         mWorldLogicTimer.scheduleTask(gameWorldFluidsLogicControllerTask, 0,
                 GameWorldFluidsLogicControllerTask.FLUID_UPDATE_INTERVAL_SEC);
         mWorldLogicTimer.scheduleTask(gameWorldBlocksLogicControllerTask, 0,
                 GameWorldBlocksLogicControllerTask.WORLD_BLOCKS_LOGIC_UPDATE_INTERVAL_SEC);
+        mWorldLogicTimer.scheduleTask(gameWorldMobDamageControllerTask, 0,
+                GameWorldMobDamageControllerTask.ENVIRONMENTAL_MOB_DAMAGE_INTERVAL_SEC);
     }
 
     public void setPlayerGameMode(int gameMode) {
@@ -49,8 +63,12 @@ public class GameProc implements Disposable {
 
     public void update(float delta) {
         mGamePhysics.update(delta);
-        mGameInput.update();
         mGameRenderer.render(delta);
+        mContainerController.update();
+    }
+
+    public void show() {
+        Gdx.input.setInputProcessor(mGameRenderer);
     }
 
     @Override
@@ -58,5 +76,6 @@ public class GameProc implements Disposable {
         mWorldLogicTimer.stop();
         mGameWorldFluidsLogicControllerTask.cancel();
         mGameWorldBlocksLogicControllerTask.cancel();
+        mGameWorldMobDamageControllerTask.cancel();
     }
 }