Merge remote-tracking branch 'origin/master'

2 files changed, 7 insertions, 7 deletions

diff --git a/core/src/com/ilotterytea/maxoning/screens/MenuScreen.java b/core/src/com/ilotterytea/maxoning/screens/MenuScreen.java
index 9855066..6b3d7f2 100644
--- a/core/src/com/ilotterytea/maxoning/screens/MenuScreen.java
+++ b/core/src/com/ilotterytea/maxoning/screens/MenuScreen.java
@@ -49,6 +49,8 @@ public class MenuScreen implements Screen {
     // Atlases:
     TextureAtlas environmentAtlas, brandAtlas, iconAtlas;
 
+    MaxonSavegame sav;
+
     private final MovingChessBackground bg;
 
     public MenuScreen(final MaxonGame game) {
@@ -69,6 +71,8 @@ public class MenuScreen implements Screen {
         this.widgetSkin = new Skin(Gdx.files.internal("sprites/gui/widgets.skin"));
         this.iconSkin = new Skin(Gdx.files.internal("sprites/gui/widgeticons.skin"));
 
+        sav = GameDataSystem.load("latest.sav");
+
         // Main Menu music:
         this.menuMusic = game.assetManager.get("mus/menu/mus_menu_loop.ogg", Music.class);
 
@@ -134,7 +138,8 @@ public class MenuScreen implements Screen {
         stage.addActor(startBtn);
 
         // // Savegame:
-        savLabel = new Label("test", skin);
+        savLabel = new Label(
+                (sav == null) ? game.locale.TranslatableText("menu.last_savegame.empty") : game.locale.FormattedText("menu.last_savegame.found"), skin);
         savLabel.setPosition((stage.getWidth() / 2f) - (savLabel.getWidth() / 2f), 8f + startBtn.getY() + startBtn.getHeight());
 
         stage.addActor(savLabel);
@@ -217,7 +222,7 @@ public class MenuScreen implements Screen {
     private void showOptions() {
         startBtn.addAction(Actions.moveTo(startBtn.getX(), -startBtn.getY() - startBtn.getHeight(), 1f, Interpolation.exp10Out));
         savLabel.addAction(Actions.moveTo(savLabel.getX(), -savLabel.getY() - savLabel.getHeight(), 1f, Interpolation.exp10Out));
-        menuTable.addAction(Actions.moveTo(menuTable.getX(), -menuTable.getY() - menuTable.getHeight(), 1f, Interpolation.exp10Out));
+        menuTable.addAction(Actions.moveTo(menuTable.getX(), -menuTable.getY() - menuTable.getHeight() - 48f, 1f, Interpolation.exp10Out));
 
         brandLogo.clearActions();
         brandLogo.addAction(
diff --git a/core/src/com/ilotterytea/maxoning/utils/serialization/GameDataSystem.java b/core/src/com/ilotterytea/maxoning/utils/serialization/GameDataSystem.java
index 157b0a5..6e3534f 100644
--- a/core/src/com/ilotterytea/maxoning/utils/serialization/GameDataSystem.java
+++ b/core/src/com/ilotterytea/maxoning/utils/serialization/GameDataSystem.java
@@ -111,11 +111,6 @@ public class GameDataSystem {
             }
         }
 
-        if (sav == null) {
-            sav = new MaxonSavegame();
-            save(sav, file_name);
-        }
-
         return sav;
     }
 }