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

diff --git a/core/src/ru/deadsoftware/cavedroid/CaveGame.java b/core/src/ru/deadsoftware/cavedroid/CaveGame.java
index 1c16791..1701e00 100644
--- a/core/src/ru/deadsoftware/cavedroid/CaveGame.java
+++ b/core/src/ru/deadsoftware/cavedroid/CaveGame.java
@@ -1,8 +1,8 @@
 package ru.deadsoftware.cavedroid;
 
+import com.badlogic.gdx.Application;
 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;
@@ -13,7 +13,7 @@ public class CaveGame extends Game {
 
     private static final String TAG = "CaveGame";
 
-    public static final String VERSION = "alpha 0.5.2";
+    public static final String VERSION = "alpha 0.9.0";
 
     private final MainConfig mMainConfig;
     private final MainComponent mMainComponent;
@@ -42,7 +42,7 @@ public class CaveGame extends Game {
     }
 
     private void initConfig() {
-        int width = mTouch ? 320 : 480;
+        int width = 480;
         int height = (int) (width * ((float) Gdx.graphics.getHeight() / Gdx.graphics.getWidth()));
 
         mMainConfig.setMainComponent(mMainComponent);
@@ -52,6 +52,12 @@ public class CaveGame extends Game {
         mMainConfig.setHeight(height);
         mMainConfig.setShowInfo(mDebug);
         mMainConfig.setAssetsPackPath(mAssetsPackPath);
+
+        if (mDebug) {
+            Gdx.app.setLogLevel(Application.LOG_DEBUG);
+        } else {
+            Gdx.app.setLogLevel(Application.LOG_ERROR);
+        }
     }
 
     public void newGame(int gameMode) {
@@ -75,14 +81,11 @@ public class CaveGame extends Game {
 
     @Override
     public void create() {
-        Gdx.app.log(TAG, mGameFolder);
         Gdx.files.absolute(mGameFolder).mkdirs();
-
         initConfig();
 
+        Gdx.app.debug(TAG, mGameFolder);
         Assets.load(mAssetLoader);
-        GameItems.load(mAssetLoader);
-
         setScreen(mMainComponent.getMenuScreen());
     }
 
@@ -91,5 +94,6 @@ public class CaveGame extends Game {
         if (screen != null) {
             screen.dispose();
         }
+        Assets.dispose();
     }
 }