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

v0.6.2e: fixed bad changes made to app lifecycle managment

Browse Source
This commit is contained in:
Evan Debenham 2017-11-19 02:21:41 -05:00 committed by Evan Debenham
parent 5c087e72aa
commit aa88bf7d23
6 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,13 +149,13 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou
private boolean paused; private boolean paused;
//Checks for gingerbread are here due to minor activity lifecycle differences //Starting with honeycomb, android's lifecycle management changes slightly
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1){ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB){
resumeGame(); resumeGame();
} }
} }
@ -164,7 +164,11 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1){ if (scene != null) {
scene.onResume();
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB){
resumeGame(); resumeGame();
} }
} }
@ -174,10 +178,10 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou
super.onPause(); super.onPause();
if (scene != null) { if (scene != null) {
scene.onFocusLost(); scene.onPause();
} }
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1){ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB){
pauseGame(); pauseGame();
} }
} }
@ -186,7 +190,7 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou
public void onStop() { public void onStop() {
super.onStop(); super.onStop();
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1){ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB){
pauseGame(); pauseGame();
} }
} }
@ -213,11 +217,6 @@ public class Game extends Activity implements GLSurfaceView.Renderer, View.OnTou
Sample.INSTANCE.resume(); Sample.INSTANCE.resume();
} }
public static void quitGame(){
Game.instance.finish();
System.exit(0);
}
public boolean isPaused(){ public boolean isPaused(){
return paused; return paused;
} }

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

@ -52,10 +52,14 @@ public class Scene extends Group {
super.destroy(); super.destroy();
} }
public void onFocusLost() { public void onPause() {
} }
public void onResume(){
}
@Override @Override
public void update() { public void update() {
super.update(); super.update();
@ -67,7 +71,7 @@ public class Scene extends Group {
} }
protected void onBackPressed() { protected void onBackPressed() {
Game.quitGame(); Game.instance.finish();
} }
protected void onMenuPressed() { protected void onMenuPressed() {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/CursedWand.java
View File

@ -416,7 +416,7 @@ public class CursedWand {
@Override @Override
protected void onSelect(int index) { protected void onSelect(int index) {
ShatteredPixelDungeon.quitGame(); Game.instance.finish();
} }
@Override @Override

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

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

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/ExitButton.java
View File

@ -70,7 +70,7 @@ public class ExitButton extends Button {
@Override @Override
protected void onClick() { protected void onClick() {
if (Game.scene() instanceof TitleScene) { if (Game.scene() instanceof TitleScene) {
ShatteredPixelDungeon.quitGame(); Game.instance.finish();
} else { } else {
ShatteredPixelDungeon.switchNoFade( TitleScene.class ); ShatteredPixelDungeon.switchNoFade( TitleScene.class );
} }

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndGame.java
View File

@ -113,7 +113,7 @@ public class WndGame extends Window {
} catch (IOException e) { } catch (IOException e) {
ShatteredPixelDungeon.reportException(e); ShatteredPixelDungeon.reportException(e);
} }
ShatteredPixelDungeon.quitGame(); Game.instance.finish();
} }
} }
); );