LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.6.2d: adjusted how the game handles pauses/focus lost

Browse Source
This commit is contained in:
Evan Debenham 2017-11-16 12:33:51 -05:00 committed by Evan Debenham
parent 9ee20966bb
commit 00a44a8352
3 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SPD-classes/src/main/java/com/watabou/noosa/Game.java
View File

@ -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();

6
SPD-classes/src/main/java/com/watabou/noosa/Scene.java
View File

@ -52,11 +52,7 @@ public class Scene extends Group {
super.destroy();
}
public void pause() {
}
public void resume() {
public void onFocusLost() {
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -454,7 +454,7 @@ public class GameScene extends PixelScene {
}
@Override
public synchronized void pause() {
public synchronized void onFocusLost() {
try {
Dungeon.saveAll();
Badges.saveGlobal();