upd: Savegame is now static and should be gotten from the getInstance method

3 files changed, 12 insertions, 5 deletions

diff --git a/core/src/kz/ilotterytea/maxon/player/Savegame.java b/core/src/kz/ilotterytea/maxon/player/Savegame.java
index 209732d..9d5f93d 100644
--- a/core/src/kz/ilotterytea/maxon/player/Savegame.java
+++ b/core/src/kz/ilotterytea/maxon/player/Savegame.java
@@ -32,6 +32,16 @@ public class Savegame implements Serializable {
     private long elapsedTime;
     private boolean isNewlyCreated;
 
+    private static Savegame savegame;
+
+    public static Savegame getInstance() {
+        if (savegame == null) {
+            savegame = load();
+        }
+
+        return savegame;
+    }
+
     private Savegame() {
         setDefaultValues();
     }
diff --git a/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java b/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java
index 707186f..11dcd5b 100644
--- a/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java
+++ b/core/src/kz/ilotterytea/maxon/screens/MenuScreen.java
@@ -43,7 +43,7 @@ public class MenuScreen implements Screen {
     private final Stage stage;
     private final Music menuMusic;
 
-    private final Savegame savegame;
+    private final Savegame savegame = Savegame.getInstance();
 
     private SceneManager sceneManager;
     private PerspectiveCamera camera;
@@ -53,7 +53,6 @@ public class MenuScreen implements Screen {
 
     public MenuScreen() {
         this.game = MaxonGame.getInstance();
-        this.savegame = Savegame.load();
 
         // Stage and skin:
         this.stage = new Stage(new ScreenViewport());
diff --git a/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java b/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java
index 70ba779..29756bf 100644
--- a/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java
+++ b/core/src/kz/ilotterytea/maxon/screens/game/GameScreen.java
@@ -55,7 +55,7 @@ public class GameScreen implements Screen, InputProcessor {
     final long playTimestamp;
     boolean isShopping = false, isInventoryEnabled = false;
 
-    private Savegame savegame;
+    private Savegame savegame = Savegame.getInstance();
 
     Stage stage;
     private Skin skin, uiSkin;
@@ -90,8 +90,6 @@ public class GameScreen implements Screen, InputProcessor {
     private final ArrayList<Timer.Task> tasks = new ArrayList<>();
 
     public GameScreen() {
-        this.savegame = Savegame.load();
-
         this.game = MaxonGame.getInstance();
         this.playTimestamp = System.currentTimeMillis();