diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameScreen.java b/core/src/ru/deadsoftware/cavedroid/game/GameScreen.java
index 370d8bd79066baf1db5c385f4d89556b53c6f740..1d47b9074cb9f65144944486e024ad7462a579cd 100644 (file)
private GameProc mGameProc;
@CheckForNull
private GameInputProcessor mGameInputProcessor;
+ @CheckForNull
+ 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();
+ mGameProc.setPlayerGameMode(gameMode);
+
Gdx.input.setInputProcessor(gameComponent.getGameInputProcessor());
}
mGameProc.dispose();
}
- GameModule.load(mMainConfig);
+ GameModule.loaded = false;
GameComponent gameComponent = DaggerGameComponent.builder()
.mainComponent(mMainConfig.getMainComponent()).build();
@Override
public void dispose() {
+ if (mGameProc != null) {
+ mGameProc.dispose();
+ }
}
}