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

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

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 @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
@ -182,18 +173,27 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
if (scene != null) {
scene.onFocusLost();
}
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1){ if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1){
pauseGame(); pauseGame();
} }
} }
@Override
public void onStop() {
super.onStop();
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1){
pauseGame();
}
}
public void pauseGame(){ public void pauseGame(){
if (paused) return; if (paused) return;
if (scene != null) {
scene.pause();
}
paused = true; paused = true;
view.onPause(); view.onPause();
Script.reset(); Script.reset();

View File

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

View File

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