upd: asset cleanup

3 files changed, 7 insertions, 10 deletions

diff --git a/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java b/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java
index fe1a9db..de84cd7 100644
--- a/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java
+++ b/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java
@@ -61,7 +61,6 @@ public class MenuScreen implements Screen {
         this.stage.addAction(Actions.sequence(Actions.alpha(0.0f), Actions.alpha(1.0f, 1f)));
 
         Skin uiSkin = game.assetManager.get("sprites/gui/ui.skin", Skin.class);
-        Skin skin = game.assetManager.get("MainSpritesheet.skin", Skin.class);
         Skin widgetSkin = game.assetManager.get("sprites/gui/widgets.skin", Skin.class);
         TextureAtlas brandAtlas = game.assetManager.get("sprites/gui/brand.atlas", TextureAtlas.class);
         TextureAtlas widgetAtlas = game.assetManager.get("sprites/gui/widgets.atlas", TextureAtlas.class);
@@ -155,7 +154,7 @@ public class MenuScreen implements Screen {
                 .padBottom(-86f);
 
         // - - -  Menu control (quit, options, etc.) - - -
-        Table controlTable = new Table(skin);
+        Table controlTable = new Table();
         controlTable.align(Align.top | Align.center);
         controlTable.pad(6f);
 
diff --git a/core/src/kz/ilotterytea/maxon/screens/SplashScreen.java b/core/src/kz/ilotterytea/maxon/screens/SplashScreen.java
index a5f7f37..c2b3a19 100644
--- a/core/src/kz/ilotterytea/maxon/screens/SplashScreen.java
+++ b/core/src/kz/ilotterytea/maxon/screens/SplashScreen.java
@@ -37,7 +37,7 @@ public class SplashScreen implements Screen {
         clickSound = Gdx.audio.newSound(Gdx.files.internal("sfx/ui/click.ogg"));
 
         this.stage = new Stage(new FitViewport(800, 600));
-        Skin skin = new Skin(Gdx.files.internal("MainSpritesheet.skin"));
+        Skin skin = new Skin(Gdx.files.internal("sprites/gui/ui.skin"));
 
         Table logoTable = new Table();
         logoTable.setFillParent(true);
diff --git a/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java b/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java
index 0468307..5cf0a5a 100644
--- a/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java
+++ b/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java
@@ -59,10 +59,10 @@ public class GameScreen implements Screen, InputProcessor {
 
     private Savegame savegame = Savegame.getInstance();
 
-    Stage stage;
-    private Skin skin, uiSkin;
+    private final Savegame savegame = Savegame.getInstance();
 
-    TextureAtlas mainAtlas, playerIconAtlas;
+    private Stage stage;
+    private Skin uiSkin;
 
     Label pointsLabel, multiplierLabel;
     AnimatedImage cat;
@@ -363,13 +363,11 @@ public class GameScreen implements Screen, InputProcessor {
 
     private void createStageUI() {
         this.stage = new Stage(new ScreenViewport());
-        this.skin = this.game.assetManager.get("MainSpritesheet.skin", Skin.class);
-        this.mainAtlas = this.game.assetManager.get("MainSpritesheet.atlas", TextureAtlas.class);
-        this.playerIconAtlas = this.game.assetManager.get("sprites/gui/player_icons.atlas", TextureAtlas.class);
+        TextureAtlas playerIconAtlas = this.game.assetManager.get("sprites/gui/player_icons.atlas", TextureAtlas.class);
 
         this.uiSkin = this.game.assetManager.get("sprites/gui/ui.skin", Skin.class);
 
-        this.shopUI = new ShopUI(savegame, this.stage, this.uiSkin, this.playerIconAtlas);
+        this.shopUI = new ShopUI(savegame, this.stage, this.uiSkin, playerIconAtlas);
 
         if (OsUtils.isMobile) {
             shopUI.createSavegameUI();