Used instantiated asset manager rather than static because apparently…

… its better for Android
basimkhajwal · May 29, 2016 · 17e77e0 · 17e77e0
1 parent 4b4c76b
commit 17e77e0
Showing 1 changed file with 7 additions and 9 deletions.
diff --git a/core/src/net/net63/codearcade/LSD/LSD.java b/core/src/net/net63/codearcade/LSD/LSD.java
@@ -1,12 +1,12 @@
 package net.net63.codearcade.LSD;
 
 import com.badlogic.gdx.Game;
+import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.graphics.FPSLogger;
 import net.net63.codearcade.LSD.managers.Assets;
 import net.net63.codearcade.LSD.managers.LevelManager;
 import net.net63.codearcade.LSD.managers.ShaderManager;
-import net.net63.codearcade.LSD.managers.SoundManager;
-import net.net63.codearcade.LSD.screens.MenuScreen;
+import net.net63.codearcade.LSD.screens.LoadingScreen;
 import net.net63.codearcade.LSD.utils.Settings;
 
 /**
@@ -18,24 +18,23 @@
 public class LSD extends Game {
 
     private FPSLogger fpsLogger;
+    public AssetManager assetManager;
 
 	public LSD() {
         super();
 
+        assetManager = new AssetManager();
         fpsLogger = new FPSLogger();
 	}
 
 	@Override
 	public void create() {
-		Assets.loadAll();
+        Settings.loadSettings();
         LevelManager.loadAll();
-        SoundManager.loadAll();
         ShaderManager.loadAll();
-        Settings.loadSettings();
-
-        SoundManager.playMusic();
+        Assets.loadFonts();
 
-		this.setScreen(new MenuScreen(this));
+		this.setScreen(new LoadingScreen(this));
 	}
 
     @Override
@@ -51,7 +50,6 @@ public void dispose() {
 
         Assets.dispose();
         LevelManager.dispose();
-        SoundManager.dispose();
         Settings.saveSettings();
     }