diff options
| author | ilotterytea <iltsu@alright.party> | 2022-10-19 22:06:16 +0600 |
|---|---|---|
| committer | ilotterytea <iltsu@alright.party> | 2022-10-19 22:06:16 +0600 |
| commit | bac4182ef9d1df55b3e2daad8be82f966a92b0dd (patch) | |
| tree | e08143c54939c527a931fd23690f8fd6e73fc2b4 /core/src/com/ilotterytea/maxoning/MaxonGame.java | |
| parent | 2434fafcdb07521c0db76037483d0c36c4280c2e (diff) | |
| parent | c792b675e340ade7e4fd6bd4e67265ba2b4cb1b5 (diff) | |
Resolved merge conflict
Diffstat (limited to 'core/src/com/ilotterytea/maxoning/MaxonGame.java')
| -rw-r--r-- | core/src/com/ilotterytea/maxoning/MaxonGame.java | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/core/src/com/ilotterytea/maxoning/MaxonGame.java b/core/src/com/ilotterytea/maxoning/MaxonGame.java index 4ee3861..f361d20 100644 --- a/core/src/com/ilotterytea/maxoning/MaxonGame.java +++ b/core/src/com/ilotterytea/maxoning/MaxonGame.java @@ -6,12 +6,8 @@ import com.badlogic.gdx.Preferences; import com.badlogic.gdx.assets.AssetManager; import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; -import com.ilotterytea.maxoning.player.MaxonPlayer; -import com.ilotterytea.maxoning.screens.AssetLoadingScreen; +import com.ilotterytea.maxoning.screens.SplashScreen; import com.ilotterytea.maxoning.utils.I18N; -import com.ilotterytea.maxoning.utils.serialization.GameDataSystem; - -import java.io.IOException; public class MaxonGame extends Game { public SpriteBatch batch; @@ -36,14 +32,6 @@ public class MaxonGame extends Game { prefs = Gdx.app.getPreferences("Maxoning"); locale = new I18N(Gdx.files.internal("i18n/" + prefs.getString("lang", "en_us") + ".json")); - if (!GameDataSystem.exists()) { - try { - GameDataSystem.SaveData(new MaxonPlayer()); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - prefs.putInteger("width", Gdx.graphics.getWidth()); prefs.putInteger("height", Gdx.graphics.getHeight()); prefs.flush(); @@ -53,7 +41,7 @@ public class MaxonGame extends Game { assetManager = new AssetManager(); - this.setScreen(new AssetLoadingScreen(this)); + this.setScreen(new SplashScreen(this)); } @Override |