X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2FGameScreen.java;h=1d47b9074cb9f65144944486e024ad7462a579cd;hb=7bb5658145e70efdfbd66ab264bf958057f26124;hp=4a7d6131f87cd78dce442950e25e9babf840a79e;hpb=ec0477587e1b23712b9b7f5dd27fd924b9933b96;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/game/GameScreen.java b/core/src/ru/deadsoftware/cavedroid/game/GameScreen.java
index 4a7d613..1d47b90 100644
--- a/core/src/ru/deadsoftware/cavedroid/game/GameScreen.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/GameScreen.java
@@ -17,23 +17,29 @@ public class GameScreen implements Screen {
     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());
     }
 
@@ -42,7 +48,7 @@ public class GameScreen implements Screen {
             mGameProc.dispose();
         }
 
-        GameModule.load(mMainConfig);
+        GameModule.loaded = false;
 
         GameComponent gameComponent = DaggerGameComponent.builder()
                 .mainComponent(mMainConfig.getMainComponent()).build();