From 0533d181a3cff326de7e6cec178354d4875e16ef Mon Sep 17 00:00:00 2001 From: Daryl Borth Date: Sun, 26 Aug 2018 20:33:04 -0600 Subject: [PATCH] change some defaults --- source/menu.cpp | 4 ++-- source/preferences.cpp | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/menu.cpp b/source/menu.cpp index 211db0e..d97967a 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -3467,7 +3467,7 @@ static int MenuSettingsFile() sprintf(options.name[i++], "Cheats Folder"); sprintf(options.name[i++], "Screenshots Folder"); sprintf(options.name[i++], "Covers Folder"); - sprintf(options.name[i++], "Artworks Folder"); + sprintf(options.name[i++], "Artwork Folder"); sprintf(options.name[i++], "Auto Load"); sprintf(options.name[i++], "Auto Save"); options.length = i; @@ -3839,7 +3839,7 @@ static int MenuSettingsMenu() snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.CoverFolder); break; case 2: - sprintf(options.value[6], "Artworks"); + sprintf(options.value[6], "Artwork"); snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.ArtworkFolder); break; } diff --git a/source/preferences.cpp b/source/preferences.cpp index d80ac66..ed4334f 100644 --- a/source/preferences.cpp +++ b/source/preferences.cpp @@ -129,7 +129,7 @@ preparePrefsData () createXMLSetting("CheatFolder", "Cheats Folder", GCSettings.CheatFolder); createXMLSetting("ScreenshotsFolder", "Screenshots Folder", GCSettings.ScreenshotsFolder); createXMLSetting("CoverFolder", "Covers Folder", GCSettings.CoverFolder); - createXMLSetting("ArtworkFolder", "Artworks Folder", GCSettings.ArtworkFolder); + createXMLSetting("ArtworkFolder", "Artwork Folder", GCSettings.ArtworkFolder); createXMLSetting("ImageFolder", "Image Folder", GCSettings.ImageFolder); createXMLSection("Network", "Network Settings"); @@ -399,7 +399,7 @@ void FixInvalidSettings() if(GCSettings.Controller > CTRL_PAD4 || GCSettings.Controller < CTRL_MOUSE) GCSettings.Controller = CTRL_PAD2; if(!(GCSettings.render >= 0 && GCSettings.render < 5)) - GCSettings.render = 4; + GCSettings.render = 3; if(!(GCSettings.videomode >= 0 && GCSettings.videomode < 5)) GCSettings.videomode = 0; } @@ -423,18 +423,18 @@ DefaultSettings () sprintf (GCSettings.CheatFolder, "%s/cheats", APPFOLDER); // Path to cheat files sprintf (GCSettings.ScreenshotsFolder, "%s/screenshots", APPFOLDER); // Path to screenshot files sprintf (GCSettings.CoverFolder, "%s/covers", APPFOLDER); // Path to cover files - sprintf (GCSettings.ArtworkFolder, "%s/artworks", APPFOLDER); // Path to artwork files - sprintf (GCSettings.ImageFolder, "%s/covers", APPFOLDER); + sprintf (GCSettings.ArtworkFolder, "%s/artwork", APPFOLDER); // Path to artwork files + sprintf (GCSettings.ImageFolder, "%s/screenshots", APPFOLDER); GCSettings.AutoLoad = 1; GCSettings.AutoSave = 1; GCSettings.Controller = CTRL_PAD2; GCSettings.videomode = 0; // automatic video mode detection - GCSettings.render = 2; // Unfiltered + GCSettings.render = 3; // Filtered (sharp) GCSettings.FilterMethod = FILTER_NONE; // no hq2x - GCSettings.widescreen = 0; // no aspect ratio correction + GCSettings.widescreen = 1; // aspect ratio correction GCSettings.zoomHor = 1.0; // horizontal zoom level GCSettings.zoomVert = 1.0; // vertical zoom level GCSettings.xshift = 0; // horizontal video shift @@ -690,8 +690,8 @@ bool LoadPrefs() if(strcmp(GCSettings.CoverFolder, "snes9x/covers") == 0) sprintf(GCSettings.CoverFolder, "snes9xgx/covers"); - if(strcmp(GCSettings.ArtworkFolder, "snes9x/artworks") == 0) - sprintf(GCSettings.ArtworkFolder, "snes9xgx/artworks"); + if(strcmp(GCSettings.ArtworkFolder, "snes9x/artwork") == 0) + sprintf(GCSettings.ArtworkFolder, "snes9xgx/artwork"); // attempt to create directories if they don't exist if(GCSettings.LoadMethod != DEVICE_AUTO) {