Commit: a4aa851902309bf1de4c959b32e6674abdcece85 - SpaceRocket (hg)

Commit MetaInfo

• Revision: a4aa851902309bf1de4c959b32e6674abdcece85 (tree)
• Time: 2022-01-10 00:43:40
• Author: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Added save/resume game.

Change Summary

• modified: core/src/com/headwayent/spacerocket/HighScoreActivity.java
• modified: core/src/com/headwayent/spacerocket/MainMenuActivity.java
• modified: core/src/com/headwayent/spacerocket/SpaceRocket.java
• modified: ios/robovm.properties

Incremental Difference

diff -r 3e6f85ec4103 -r a4aa85190230 core/src/com/headwayent/spacerocket/HighScoreActivity.java
--- a/core/src/com/headwayent/spacerocket/HighScoreActivity.java	Fri Jan 07 22:01:56 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/HighScoreActivity.java	Sun Jan 09 17:43:40 2022 +0200
@@ -12,12 +12,9 @@
 import com.badlogic.gdx.utils.ScreenUtils;
 import com.badlogic.gdx.utils.viewport.ScreenViewport;
 import com.headwayent.spacerocket.old.DifficultySelection;
-import com.headwayent.spacerocket.old.ExtendedCanvas;
 import com.headwayent.spacerocket.old.Status;
 
-import java.util.ArrayList;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.TreeMap;
 
 public class HighScoreActivity extends ScreenAdapter {
@@ -139,7 +136,7 @@
 	private void saveScore(String userName) {
 		SpaceRocket gameEngine = SpaceRocket.getGame();
 		if (gameEngine.getGameMode() == SpaceRocket.GameMode.SP) {
-			gameEngine.SaveGame(userName);
+			gameEngine.saveGame(userName);
 		}
 		Status status = gameEngine.getCanvas().getStatus();
 		String msg = "Congratulations! You have reached a new " +

diff -r 3e6f85ec4103 -r a4aa85190230 core/src/com/headwayent/spacerocket/MainMenuActivity.java
--- a/core/src/com/headwayent/spacerocket/MainMenuActivity.java	Fri Jan 07 22:01:56 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/MainMenuActivity.java	Sun Jan 09 17:43:40 2022 +0200
@@ -36,6 +36,7 @@
         Skin skin = new Skin(Gdx.files.internal("uiskin.json"));
 
         //create buttons
+        TextButton resumeGame = new TextButton("Resume Game", skin);
         TextButton newGame = new TextButton("New Game", skin);
         TextButton preferences = new TextButton("Preferences", skin);
         TextButton highScore = new TextButton("High Score", skin);
@@ -44,6 +45,10 @@
         TextButton exit = new TextButton("Exit", skin);
 
         //add buttons to table
+        if (SpaceRocket.getGame().isSessionResumeAvailable()) {
+            table.add(resumeGame).fillX().uniformX();
+            table.row().pad(10, 0, 0, 0);
+        }
         table.add(newGame).fillX().uniformX();
         table.row().pad(10, 0, 0, 0);
         table.add(preferences).fillX().uniformX();
@@ -64,6 +69,14 @@
             }
         });
 
+        resumeGame.addListener(new ChangeListener() {
+            @Override
+            public void changed(ChangeEvent event, Actor actor) {
+                SpaceRocket.getGame().changeScreen(SpaceRocket.Screen.IN_GAME);
+                SpaceRocket.getGame().resumeSession();
+            }
+        });
+
         newGame.addListener(new ChangeListener() {
             @Override
             public void changed(ChangeEvent event, Actor actor) {

diff -r 3e6f85ec4103 -r a4aa85190230 core/src/com/headwayent/spacerocket/SpaceRocket.java
--- a/core/src/com/headwayent/spacerocket/SpaceRocket.java	Fri Jan 07 22:01:56 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/SpaceRocket.java	Sun Jan 09 17:43:40 2022 +0200
@@ -96,6 +96,7 @@
 	@Override
 	public void dispose () {
 		super.dispose();
+		saveSession();
 		batch.dispose();
 		mainTextureAtlas.dispose();
 	}
@@ -216,7 +217,11 @@
 		save.writeBytes(b, false);
 	}
 
-	private void resumeSession() {
+	public boolean isSessionResumeAvailable() {
+		return Gdx.files.local("save").exists();
+	}
+
+	public void resumeSession() {
 		FileHandle save = Gdx.files.local("save");
 
 		canvas.getGraphicsManager().playSingle();
@@ -244,10 +249,11 @@
 			xPos = Math.round(xPosF * ExtendedCanvas.getScreenWidth());
 			yPos = Math.round(yPosF * ExtendedCanvas.getScreenHeight());
 			canvas.load(xPos, yPos, score, lives, currentBoss, bossHealth);
+			save.delete();
 		}
 	}
 
-	public void SaveGame(String userName) {
+	public void saveGame(String userName) {
 		if (userName == null || "".equals(userName)) {
 			return;
 		}

diff -r 3e6f85ec4103 -r a4aa85190230 ios/robovm.properties
--- a/ios/robovm.properties	Fri Jan 07 22:01:56 2022 +0200
+++ b/ios/robovm.properties	Sun Jan 09 17:43:40 2022 +0200
@@ -2,5 +2,5 @@
 app.id=com.headwayent.spacerocket
 app.mainclass=com.headwayent.spacerocket.IOSLauncher
 app.executable=IOSLauncher
-app.build=5
+app.build=6
 app.name=Hotshot 2D