X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2FCaveGame.java;h=1c1679145d6a70bf8a73948ace2e76f3f3ba06c0;hb=076b501cc25dc05c9fd26e3f71d850c7277120cb;hp=f1fb3eed43b8be66c7f358e028561085358bdcdb;hpb=f4d52e3e4a3712050532786fca0aded5ff8b5a03;p=cavedroid.git

diff --git a/core/src/ru/deadsoftware/cavedroid/CaveGame.java b/core/src/ru/deadsoftware/cavedroid/CaveGame.java
index f1fb3ee..1c16791 100644
--- a/core/src/ru/deadsoftware/cavedroid/CaveGame.java
+++ b/core/src/ru/deadsoftware/cavedroid/CaveGame.java
@@ -3,37 +3,74 @@ package ru.deadsoftware.cavedroid;
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
 import ru.deadsoftware.cavedroid.game.GameItems;
+import ru.deadsoftware.cavedroid.game.GameScreen;
 import ru.deadsoftware.cavedroid.misc.Assets;
+import ru.deadsoftware.cavedroid.misc.utils.AssetLoader;
+
+import javax.annotation.Nullable;
 
 public class CaveGame extends Game {
 
     private static final String TAG = "CaveGame";
 
-    public static final String VERSION = "alpha 0.4";
+    public static final String VERSION = "alpha 0.5.2";
+
+    private final MainConfig mMainConfig;
+    private final MainComponent mMainComponent;
+    private final AssetLoader mAssetLoader;
 
     private final String mGameFolder;
     private final boolean mTouch;
     private boolean mDebug;
 
-    public CaveGame(String gameFolder, boolean touch) {
+    @Nullable
+    private final String mAssetsPackPath;
+
+    public CaveGame(String gameFolder, boolean touch, @Nullable String assetsPackPath) {
         mGameFolder = gameFolder;
         mTouch = touch;
+        mAssetsPackPath = assetsPackPath;
+
+        mMainComponent = DaggerMainComponent.builder().caveGame(this).build();
+
+        mMainConfig = mMainComponent.getMainConfig();
+        mAssetLoader = mMainComponent.getAssetLoader();
     }
 
     public void setDebug(boolean debug) {
         mDebug = debug;
     }
 
-    private void initConfig(MainConfig mainConfig, MainComponent mainComponent) {
+    private void initConfig() {
         int width = mTouch ? 320 : 480;
         int height = (int) (width * ((float) Gdx.graphics.getHeight() / Gdx.graphics.getWidth()));
 
-        mainConfig.setMainComponent(mainComponent);
-        mainConfig.setGameFolder(mGameFolder);
-        mainConfig.setTouch(mTouch);
-        mainConfig.setWidth(width);
-        mainConfig.setHeight(height);
-        mainConfig.setShowInfo(true);
+        mMainConfig.setMainComponent(mMainComponent);
+        mMainConfig.setGameFolder(mGameFolder);
+        mMainConfig.setTouch(mTouch);
+        mMainConfig.setWidth(width);
+        mMainConfig.setHeight(height);
+        mMainConfig.setShowInfo(mDebug);
+        mMainConfig.setAssetsPackPath(mAssetsPackPath);
+    }
+
+    public void newGame(int gameMode) {
+        GameScreen gameScreen = mMainComponent.getGameScreen();
+        gameScreen.newGame(gameMode);
+        setScreen(gameScreen);
+    }
+
+    public void loadGame() {
+        GameScreen gameScreen = mMainComponent.getGameScreen();
+        gameScreen.loadGame();
+        setScreen(gameScreen);
+    }
+
+    public void quitGame() {
+        if (screen != null) {
+            screen.dispose();
+        }
+        setScreen(mMainComponent.getMenuScreen());
     }
 
     @Override
@@ -41,12 +78,18 @@ public class CaveGame extends Game {
         Gdx.app.log(TAG, mGameFolder);
         Gdx.files.absolute(mGameFolder).mkdirs();
 
-        Assets.load();
-        GameItems.load();
+        initConfig();
 
-        MainComponent mainComponent = DaggerMainComponent.create();
-        initConfig(mainComponent.getGameConfig(), mainComponent);
-        setScreen(mainComponent.getGameScreen());
+        Assets.load(mAssetLoader);
+        GameItems.load(mAssetLoader);
+
+        setScreen(mMainComponent.getMenuScreen());
     }
 
+    @Override
+    public void dispose() {
+        if (screen != null) {
+            screen.dispose();
+        }
+    }
 }