X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameProc.java;h=184e376cba5c448991c67c303e73f132c613cb3a;hb=3b6f968a7a7167b57f43e6e5290ba40547781a0b;hp=3a2244052b1c8b1353ea104751570aea671fe055;hpb=1c004c0ce7e183e773b5b486295c25e39732e899;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java index 3a22440..184e376 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java +++ b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java @@ -5,22 +5,18 @@ import com.badlogic.gdx.utils.Timer; import ru.deadsoftware.cavedroid.game.mobs.MobsController; import ru.deadsoftware.cavedroid.game.world.GameWorldBlocksLogicControllerTask; import ru.deadsoftware.cavedroid.game.world.GameWorldFluidsLogicControllerTask; -import ru.deadsoftware.cavedroid.misc.utils.AssetLoader; 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 GameWorldFluidsLogicControllerTask mGameWorldFluidsLogicControllerTask; private final GameWorldBlocksLogicControllerTask mGameWorldBlocksLogicControllerTask; - private final GameItemsHolder mGameItemsHolder; private final Timer mWorldLogicTimer = new Timer(); @@ -30,9 +26,7 @@ public class GameProc implements Disposable { GameRenderer gameRenderer, MobsController mobsController, GameWorldFluidsLogicControllerTask gameWorldFluidsLogicControllerTask, - GameWorldBlocksLogicControllerTask gameWorldBlocksLogicControllerTask, - GameItemsHolder gameItemsHolder, - AssetLoader assetLoader + GameWorldBlocksLogicControllerTask gameWorldBlocksLogicControllerTask ) { mGamePhysics = gamePhysics; mGameInput = gameInput; @@ -40,9 +34,8 @@ public class GameProc implements Disposable { mMobsController = mobsController; mGameWorldFluidsLogicControllerTask = gameWorldFluidsLogicControllerTask; mGameWorldBlocksLogicControllerTask = gameWorldBlocksLogicControllerTask; - mGameItemsHolder = gameItemsHolder; - mGameItemsHolder.initialize(); + mWorldLogicTimer.scheduleTask(gameWorldFluidsLogicControllerTask, 0, GameWorldFluidsLogicControllerTask.FLUID_UPDATE_INTERVAL_SEC);