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

v0.8.2a: removed some redundant work in onCreate

Browse Source
This commit is contained in:
Evan Debenham 2020-08-13 17:09:13 -04:00
parent cf22867666
commit 380faca85d
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidGame.java
View File

@ -49,38 +49,45 @@ public class AndroidGame extends AndroidApplication {
@Override @Override
protected void onCreate (Bundle savedInstanceState) { protected void onCreate (Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
instance = this;
try {
Game.version = getPackageManager().getPackageInfo( getPackageName(), 0 ).versionName;
} catch (PackageManager.NameNotFoundException e) {
Game.version = "???";
}
try {
Game.versionCode = getPackageManager().getPackageInfo( getPackageName(), 0 ).versionCode;
} catch (PackageManager.NameNotFoundException e) {
Game.versionCode = 0;
}
if (UpdateImpl.supportsUpdates()){ //there are some things we only need to set up on first launch
Updates.service = UpdateImpl.getUpdateService(); if (instance == null) {
}
if (NewsImpl.supportsNews()){
News.service = NewsImpl.getNewsService();
}
FileUtils.setDefaultFileProperties( Files.FileType.Local, "" ); instance = this;
// grab preferences directly using our instance first try {
// so that we don't need to rely on Gdx.app, which isn't initialized yet. Game.version = getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
// Note that we use a different prefs name on android for legacy purposes, } catch (PackageManager.NameNotFoundException e) {
// this is the default prefs filename given to an android app (.xml is automatically added to it) Game.version = "???";
SPDSettings.set(instance.getPreferences("ShatteredPixelDungeon")); }
try {
Game.versionCode = getPackageManager().getPackageInfo(getPackageName(), 0).versionCode;
} catch (PackageManager.NameNotFoundException e) {
Game.versionCode = 0;
}
if (UpdateImpl.supportsUpdates()) {
Updates.service = UpdateImpl.getUpdateService();
}
if (NewsImpl.supportsNews()) {
News.service = NewsImpl.getNewsService();
}
FileUtils.setDefaultFileProperties(Files.FileType.Local, "");
// grab preferences directly using our instance first
// so that we don't need to rely on Gdx.app, which isn't initialized yet.
// Note that we use a different prefs name on android for legacy purposes,
// this is the default prefs filename given to an android app (.xml is automatically added to it)
SPDSettings.set(instance.getPreferences("ShatteredPixelDungeon"));
} else {
instance = this;
}
//set desired orientation (if it exists) before initializing the app. //set desired orientation (if it exists) before initializing the app.
if (SPDSettings.landscape() != null) { if (SPDSettings.landscape() != null) {
AndroidGame.instance.setRequestedOrientation( SPDSettings.landscape() ? instance.setRequestedOrientation( SPDSettings.landscape() ?
ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE : ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE :
ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT ); ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT );
} }

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/SPDAction.java
View File

@ -131,6 +131,10 @@ public class SPDAction extends GameAction {
public static void loadBindings(){ public static void loadBindings(){
if (!KeyBindings.getAllBindings().isEmpty()){
return;
}
try { try {
Bundle b = FileUtils.bundleFromFile(BINDINGS_FILE); Bundle b = FileUtils.bundleFromFile(BINDINGS_FILE);