diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameScreen.java b/core/src/ru/deadsoftware/cavedroid/game/GameScreen.java
index 370d8bd79066baf1db5c385f4d89556b53c6f740..d7546e98ad60758261240dfbd661425e92f90bc6 100644 (file)
package ru.deadsoftware.cavedroid.game;
-import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Screen;
+import org.jetbrains.annotations.Nullable;
import ru.deadsoftware.cavedroid.MainConfig;
-import javax.annotation.CheckForNull;
import javax.inject.Inject;
import javax.inject.Singleton;
private final MainConfig mMainConfig;
- @CheckForNull
+ @Nullable
private GameProc mGameProc;
- @CheckForNull
- private GameInputProcessor mGameInputProcessor;
+ @Nullable
+ private GameItemsHolder mGameItemsHolder;
@Inject
public GameScreen(MainConfig mainConfig) {
mMainConfig = mainConfig;
}
- public void newGame() {
+ public void newGame(int gameMode) {
if (mGameProc != null) {
mGameProc.dispose();
}
+ GameModule.loaded = true;
+
GameComponent gameComponent = DaggerGameComponent.builder()
.mainComponent(mMainConfig.getMainComponent()).build();
mGameProc = gameComponent.getGameProc();
- mGameInputProcessor = gameComponent.getGameInputProcessor();
- Gdx.input.setInputProcessor(gameComponent.getGameInputProcessor());
+ mGameProc.setPlayerGameMode(gameMode);
}
public void loadGame() {
mGameProc.dispose();
}
- GameModule.load(mMainConfig);
+ GameModule.loaded = false;
GameComponent gameComponent = DaggerGameComponent.builder()
.mainComponent(mMainConfig.getMainComponent()).build();
mGameProc = gameComponent.getGameProc();
- mGameInputProcessor = gameComponent.getGameInputProcessor();
-
- Gdx.input.setInputProcessor(gameComponent.getGameInputProcessor());
}
@Override
@Override
public void show() {
- Gdx.input.setInputProcessor(mGameInputProcessor);
+// Gdx.input.setInputProcessor(mGameInputProcessor);
+ mGameProc.show();
}
@Override
@Override
public void dispose() {
+ if (mGameProc != null) {
+ mGameProc.dispose();
+ }
}
}