From c02c00ee6473d424ba3574533987d8fdf98ce68c Mon Sep 17 00:00:00 2001
From: Lonami Exo <totufals@hotmail.com>
Date: Fri, 10 Feb 2017 13:14:15 +0100
Subject: [PATCH] Save on pause, don't save time mode, ignore *.sav files

---
 .gitignore                                    |   3 ++
 android/assets/ui/stopwatch_saved.png         | Bin 2673 -> 0 bytes
 .../io/github/lonamiwebs/klooni/Klooni.java   |   1 -
 .../lonamiwebs/klooni/screens/GameScreen.java |  40 ++++++++++--------
 .../klooni/screens/MainMenuScreen.java        |   4 +-
 5 files changed, 27 insertions(+), 21 deletions(-)
 delete mode 100644 android/assets/ui/stopwatch_saved.png

diff --git a/.gitignore b/.gitignore
index c5273b9..7a1ba11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+## Klooni save data
+*.sav
+
 ## Java
 
 *.class
diff --git a/android/assets/ui/stopwatch_saved.png b/android/assets/ui/stopwatch_saved.png
deleted file mode 100644
index e321bbe27e97a43f6eb0bfde3179ce04cc1f8d4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2673
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

diff --git a/core/src/io/github/lonamiwebs/klooni/Klooni.java b/core/src/io/github/lonamiwebs/klooni/Klooni.java
index fae8ac4..89464fe 100644
--- a/core/src/io/github/lonamiwebs/klooni/Klooni.java
+++ b/core/src/io/github/lonamiwebs/klooni/Klooni.java
@@ -44,7 +44,6 @@ public class Klooni extends Game {
         skin.add("play_saved_texture", new Texture(Gdx.files.internal("ui/play_saved.png")));
         skin.add("star_texture", new Texture(Gdx.files.internal("ui/star.png")));
         skin.add("stopwatch_texture", new Texture(Gdx.files.internal("ui/stopwatch.png")));
-        skin.add("stopwatch_saved_texture", new Texture(Gdx.files.internal("ui/stopwatch_saved.png")));
         skin.add("palette_texture", new Texture(Gdx.files.internal("ui/palette.png")));
         skin.add("home_texture", new Texture(Gdx.files.internal("ui/home.png")));
         skin.add("replay_texture", new Texture(Gdx.files.internal("ui/replay.png")));
diff --git a/core/src/io/github/lonamiwebs/klooni/screens/GameScreen.java b/core/src/io/github/lonamiwebs/klooni/screens/GameScreen.java
index 886161a..1b28e34 100644
--- a/core/src/io/github/lonamiwebs/klooni/screens/GameScreen.java
+++ b/core/src/io/github/lonamiwebs/klooni/screens/GameScreen.java
@@ -88,13 +88,14 @@ class GameScreen implements Screen, InputProcessor, BinSerializable {
 
         gameOverSound = Gdx.audio.newSound(Gdx.files.internal("sound/game_over.mp3"));
 
-        if (loadSave) {
-            // The user might have a previous game. If this is the case, load it
-            tryLoad();
-        }
-        else {
-            // Ensure that there is no old save, we don't want to load it, thus delete it
-            deleteSave();
+        if (gameMode == GAME_MODE_SCORE) {
+            if (loadSave) {
+                // The user might have a previous game. If this is the case, load it
+                tryLoad();
+            } else {
+                // Ensure that there is no old save, we don't want to load it, thus delete it
+                deleteSave();
+            }
         }
     }
 
@@ -121,7 +122,8 @@ class GameScreen implements Screen, InputProcessor, BinSerializable {
                 gameOverSound.play();
 
             // The user should not be able to return to the game if its game over
-            deleteSave();
+            if (gameMode == GAME_MODE_SCORE)
+                deleteSave();
         }
     }
 
@@ -137,9 +139,15 @@ class GameScreen implements Screen, InputProcessor, BinSerializable {
             Gdx.input.setInputProcessor(this);
     }
 
+    // Save the state, the user might leave the game in any of the following 2 methods
     private void showPauseMenu() {
         pauseMenu.show(false);
-        save(); // Save the state, the user might leave the game
+        save();
+    }
+
+    @Override
+    public void pause() {
+        save();
     }
 
     @Override
@@ -214,14 +222,11 @@ class GameScreen implements Screen, InputProcessor, BinSerializable {
     @Override
     public void resize(int width, int height) { }
 
-    @Override
-    public void pause() { }
-
     @Override
     public void resume() { }
 
     @Override
-    public void hide() { }
+    public void hide() { /* Hide can only be called if the menu was shown. Place logic there. */ }
 
     @Override
     public boolean keyDown(int keycode) {
@@ -253,8 +258,10 @@ class GameScreen implements Screen, InputProcessor, BinSerializable {
     //region Saving and loading
 
     private void save() {
-        // Only save if the game is not over
-        if (gameOverDone)
+        // Only save if the game is not over and the game mode is not the time mode. It
+        // makes no sense to save the time game mode since it's supposed to be something quick.
+        // Don't save either if the score is 0, which means the player did nothing.
+        if (gameOverDone || gameMode != GAME_MODE_SCORE || scorer.getCurrentScore() == 0)
             return;
 
         final FileHandle handle = Gdx.files.local(SAVE_DAT_FILENAME);
@@ -266,7 +273,7 @@ class GameScreen implements Screen, InputProcessor, BinSerializable {
         }
     }
 
-    static void deleteSave() {
+    private void deleteSave() {
         final FileHandle handle = Gdx.files.local(SAVE_DAT_FILENAME);
         if (handle.exists())
             handle.delete();
@@ -277,7 +284,6 @@ class GameScreen implements Screen, InputProcessor, BinSerializable {
     }
 
     private boolean tryLoad() {
-        // Load will fail if the game modes differ, but that's okay
         final FileHandle handle = Gdx.files.local(SAVE_DAT_FILENAME);
         if (handle.exists()) {
             try {
diff --git a/core/src/io/github/lonamiwebs/klooni/screens/MainMenuScreen.java b/core/src/io/github/lonamiwebs/klooni/screens/MainMenuScreen.java
index ebd7267..04ea472 100644
--- a/core/src/io/github/lonamiwebs/klooni/screens/MainMenuScreen.java
+++ b/core/src/io/github/lonamiwebs/klooni/screens/MainMenuScreen.java
@@ -66,9 +66,7 @@ public class MainMenuScreen extends InputListener implements Screen {
         table.add(starButton).space(16);
 
         // Time mode
-        // TODO Would be nice if it actually showed the saved texture iff that's the saved game mode
-        final SoftButton statsButton = new SoftButton(
-                2, GameScreen.hasSavedData() ? "stopwatch_saved_texture" : "stopwatch_texture");
+        final SoftButton statsButton = new SoftButton(2, "stopwatch_texture");
         statsButton.addListener(new ChangeListener() {
             @Override
             public void changed(ChangeEvent event, Actor actor) {