diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameProc.java b/core/src/ru/deadsoftware/cavedroid/game/GameProc.java
index 75605bf058dd6b9ee2d4fbc6a88a627202aecf7a..d797680d8dad99036c528ab620360a86542e0c28 100644 (file)
package ru.deadsoftware.cavedroid.game;
package ru.deadsoftware.cavedroid.game;
+import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.utils.Disposable;
import com.badlogic.gdx.utils.Timer;
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.MobsController;
+import ru.deadsoftware.cavedroid.game.mobs.player.Player;
import ru.deadsoftware.cavedroid.game.world.GameWorldBlocksLogicControllerTask;
import ru.deadsoftware.cavedroid.game.world.GameWorldFluidsLogicControllerTask;
import ru.deadsoftware.cavedroid.game.world.GameWorldMobDamageControllerTask;
import ru.deadsoftware.cavedroid.game.world.GameWorldBlocksLogicControllerTask;
import ru.deadsoftware.cavedroid.game.world.GameWorldFluidsLogicControllerTask;
import ru.deadsoftware.cavedroid.game.world.GameWorldMobDamageControllerTask;
public class GameProc implements Disposable {
private final GamePhysics mGamePhysics;
public class GameProc implements Disposable {
private final GamePhysics mGamePhysics;
- private final GameInput mGameInput;
private final GameRenderer mGameRenderer;
private final MobsController mMobsController;
private final GameWorldFluidsLogicControllerTask mGameWorldFluidsLogicControllerTask;
private final GameRenderer mGameRenderer;
private final MobsController mMobsController;
private final GameWorldFluidsLogicControllerTask mGameWorldFluidsLogicControllerTask;
private final Timer mWorldLogicTimer = new Timer();
@Inject
private final Timer mWorldLogicTimer = new Timer();
@Inject
- public GameProc(GamePhysics gamePhysics,
- GameInput gameInput,
+ public GameProc(MainConfig mainConfig,
+ GamePhysics gamePhysics,
GameRenderer gameRenderer,
MobsController mobsController,
GameWorldFluidsLogicControllerTask gameWorldFluidsLogicControllerTask,
GameRenderer gameRenderer,
MobsController mobsController,
GameWorldFluidsLogicControllerTask gameWorldFluidsLogicControllerTask,
GameWorldMobDamageControllerTask gameWorldMobDamageControllerTask
) {
mGamePhysics = gamePhysics;
GameWorldMobDamageControllerTask gameWorldMobDamageControllerTask
) {
mGamePhysics = gamePhysics;
- mGameInput = gameInput;
mGameRenderer = gameRenderer;
mMobsController = mobsController;
mGameWorldFluidsLogicControllerTask = gameWorldFluidsLogicControllerTask;
mGameWorldBlocksLogicControllerTask = gameWorldBlocksLogicControllerTask;
mGameWorldMobDamageControllerTask = gameWorldMobDamageControllerTask;
mGameRenderer = gameRenderer;
mMobsController = mobsController;
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(gameWorldFluidsLogicControllerTask, 0,
GameWorldFluidsLogicControllerTask.FLUID_UPDATE_INTERVAL_SEC);
public void update(float delta) {
mGamePhysics.update(delta);
public void update(float delta) {
mGamePhysics.update(delta);
- mGameInput.update();
mGameRenderer.render(delta);
}
mGameRenderer.render(delta);
}
+ public void show() {
+ Gdx.input.setInputProcessor(mGameRenderer);
+ }
+
@Override
public void dispose() {
mWorldLogicTimer.stop();
@Override
public void dispose() {
mWorldLogicTimer.stop();