From 00a44a8352c5c9fa99fa9dca059ee04a7b6314d6 Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Thu, 16 Nov 2017 12:33:51 -0500
Subject: [PATCH] v0.6.2d: adjusted how the game handles pauses/focus lost

---
 .../src/main/java/com/watabou/noosa/Game.java | 26 +++++++++----------
 .../main/java/com/watabou/noosa/Scene.java    |  6 +----
 .../scenes/GameScene.java                     |  2 +-
 3 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Game.java b/SPD-classes/src/main/java/com/watabou/noosa/Game.java
index 6d6a425aa..fb0578227 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/Game.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/Game.java
@@ -160,15 +160,6 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou
 		}
 	}
 	
-	@Override
-	public void onStop() {
-		super.onStop();
-		
-		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1){
-			pauseGame();
-		}
-	}
-	
 	@Override
 	protected void onResume() {
 		super.onResume();
@@ -182,18 +173,27 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou
 	protected void onPause() {
 		super.onPause();
 		
+		if (scene != null) {
+			scene.onFocusLost();
+		}
+		
 		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1){
 			pauseGame();
 		}
 	}
 	
+	@Override
+	public void onStop() {
+		super.onStop();
+		
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1){
+			pauseGame();
+		}
+	}
+	
 	public void pauseGame(){
 		if (paused) return;
 		
-		if (scene != null) {
-			scene.pause();
-		}
-		
 		paused = true;
 		view.onPause();
 		Script.reset();
diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Scene.java b/SPD-classes/src/main/java/com/watabou/noosa/Scene.java
index a166a5c17..4a43b1a8c 100644
--- a/SPD-classes/src/main/java/com/watabou/noosa/Scene.java
+++ b/SPD-classes/src/main/java/com/watabou/noosa/Scene.java
@@ -52,11 +52,7 @@ public class Scene extends Group {
 		super.destroy();
 	}
 	
-	public void pause() {
-		
-	}
-	
-	public void resume() {
+	public void onFocusLost() {
 		
 	}
 	
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
index 83b4545cc..6c329e269 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
@@ -454,7 +454,7 @@ public class GameScene extends PixelScene {
 	}
 	
 	@Override
-	public synchronized void pause() {
+	public synchronized void onFocusLost() {
 		try {
 			Dungeon.saveAll();
 			Badges.saveGlobal();