cleanup

Author: NicholasBatesNZ

engine/src/main/java/org/destinationsol/game/SaveManager.java

@@ -188,10 +188,16 @@ public static boolean resourceExists(String fileName) {
     }
 
     /**
-     * Tests is the game has a previous ship (a game to continue)
+     * Tests if the game has a compatible previous ship (a game to continue)
      */
-    public static boolean hasPrevShip(String fileName) {
-        return resourceExists(fileName);
+    public static boolean hasPreviousCompatibleShip() {
+        if (!resourceExists(Const.SAVE_FILE_NAME)) {
+            return false;
+        }
+        IniReader reader = new IniReader(Const.SAVE_FILE_NAME, null);
+        String saveMajorVersion = reader.getString("version", "").split("\\.")[0];
+        String gameMajorVersion = Const.VERSION.split("\\.")[0];
+        return saveMajorVersion.equals(gameMajorVersion);
     }
 
     /**

engine/src/main/java/org/destinationsol/menu/NewGameScreen.java

@@ -18,9 +18,7 @@
 
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
-import org.destinationsol.Const;
 import org.destinationsol.GameOptions;
-import org.destinationsol.IniReader;
 import org.destinationsol.SolApplication;
 import org.destinationsol.assets.Assets;
 import org.destinationsol.common.SolColor;
@@ -60,10 +58,7 @@ public class NewGameScreen extends SolUiBaseScreen {
 
     @Override
     public void onAdd(SolApplication solApplication) {
-        IniReader reader = new IniReader(Const.SAVE_FILE_NAME, null);
-        String saveMajorVersion = reader.getString("version", "").split("\\.")[0];
-        String gameMajorVersion = Const.VERSION.split("\\.")[0];
-        continueControl.setEnabled(SaveManager.hasPrevShip("prevShip.ini") && saveMajorVersion.equals(gameMajorVersion));
+        continueControl.setEnabled(SaveManager.hasPreviousCompatibleShip());
     }
 
     @Override