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

v0.8.0: changed default settings file

Browse Source
This commit is contained in:
Evan Debenham 2019-12-18 14:22:58 -05:00
parent 11975fb6c2
commit e874dea93e
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SPD-classes/src/main/java/com/watabou/utils/GameSettings.java
View File

@ -26,8 +26,7 @@ import com.badlogic.gdx.Preferences;
public class GameSettings {
//TODO might want to rename this file. this is the auto-generated name for android atm
public static final String DEFAULT_PREFS_FILE = "ShatteredPixelDungeon";
public static final String DEFAULT_PREFS_FILE = "settings.xml";
private static Preferences prefs;

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

@ -69,6 +69,8 @@ public class AndroidGame extends AndroidApplication {
// 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"));
//set desired orientation (if it exists) before initializing the app.

14
desktop/src/main/java/com/shatteredpixel/shatteredpixeldungeon/desktop/DesktopLauncher.java
View File

@ -25,7 +25,9 @@ import com.badlogic.gdx.Files;
import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Application;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3ApplicationConfiguration;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3FileHandle;
import com.badlogic.gdx.backends.lwjgl3.Lwjgl3Preferences;
import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.utils.SharedLibraryLoader;
import com.shatteredpixel.shatteredpixeldungeon.SPDSettings;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
@ -100,8 +102,6 @@ public class DesktopLauncher {
config.setTitle( title );
//TODO this is currently the same location and filenames as the old desktop codebase
// If I want to move it now would be the time
String basePath = "";
if (SharedLibraryLoader.isWindows) {
if (System.getProperties().getProperty("os.name").equals("Windows XP")) {
@ -114,8 +114,16 @@ public class DesktopLauncher {
} else if (SharedLibraryLoader.isLinux) {
basePath = ".shatteredpixel/shattered-pixel-dungeon/";
}
//copy over prefs from old file location from legacy desktop codebase
FileHandle oldPrefs = new Lwjgl3FileHandle(basePath + "pd-prefs", Files.FileType.External);
FileHandle newPrefs = new Lwjgl3FileHandle(basePath + SPDSettings.DEFAULT_PREFS_FILE, Files.FileType.External);
if (oldPrefs.exists() && !newPrefs.exists()){
oldPrefs.copyTo(newPrefs);
}
config.setPreferencesConfig( basePath, Files.FileType.External );
SPDSettings.set( new Lwjgl3Preferences( "pd-prefs", basePath) );
SPDSettings.set( new Lwjgl3Preferences( SPDSettings.DEFAULT_PREFS_FILE, basePath) );
FileUtils.setDefaultFileProperties( Files.FileType.External, basePath );
config.setWindowSizeLimits( 960, 640, -1, -1 );