The-Homebrew-Cloud/snes9xgx
2
0
Fork 0
mirror of https://github.com/dborth/snes9xgx.git synced 2024-11-01 08:25:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

removed ImageFolder from GCSettings because it can always be retrieved from GCSettings.PreviewImage, added function to get its value

Browse Source
This commit is contained in:
Zalo 2019-01-02 17:16:32 +01:00
parent dc4d93d006
commit 85cc152ca9
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/menu.cpp
View File

@ -1042,7 +1042,7 @@ static int MenuGameSelection()
if(previousBrowserIndex != browser.selIndex) if(previousBrowserIndex != browser.selIndex)
{ {
previousBrowserIndex = browser.selIndex; previousBrowserIndex = browser.selIndex;
snprintf(imagePath, MAXJOLIET, "%s%s/%s.png", pathPrefix[GCSettings.LoadMethod], GCSettings.ImageFolder, browserList[browser.selIndex].displayname); snprintf(imagePath, MAXJOLIET, "%s%s/%s.png", pathPrefix[GCSettings.LoadMethod], ImageFolder(), browserList[browser.selIndex].displayname);
AllocSaveBuffer(); AllocSaveBuffer();
int width, height; int width, height;
@ -4000,15 +4000,12 @@ static int MenuSettingsMenu()
{ {
case 0: case 0:
sprintf(options.value[6], "Screenshots"); sprintf(options.value[6], "Screenshots");
snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.ScreenshotsFolder);
break; break;
case 1: case 1:
sprintf(options.value[6], "Covers"); sprintf(options.value[6], "Covers");
snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.CoverFolder);
break; break;
case 2: case 2:
sprintf(options.value[6], "Artwork"); sprintf(options.value[6], "Artwork");
snprintf(GCSettings.ImageFolder, MAXJOLIET, "%s", GCSettings.ArtworkFolder);
break; break;
} }

3
source/preferences.cpp
View File

@ -132,7 +132,6 @@ preparePrefsData ()
createXMLSetting("ScreenshotsFolder", "Screenshots Folder", GCSettings.ScreenshotsFolder); createXMLSetting("ScreenshotsFolder", "Screenshots Folder", GCSettings.ScreenshotsFolder);
createXMLSetting("CoverFolder", "Covers Folder", GCSettings.CoverFolder); createXMLSetting("CoverFolder", "Covers Folder", GCSettings.CoverFolder);
createXMLSetting("ArtworkFolder", "Artwork Folder", GCSettings.ArtworkFolder); createXMLSetting("ArtworkFolder", "Artwork Folder", GCSettings.ArtworkFolder);
createXMLSetting("ImageFolder", "Image Folder", GCSettings.ImageFolder);
createXMLSection("Network", "Network Settings"); createXMLSection("Network", "Network Settings");
@ -317,7 +316,6 @@ decodePrefsData ()
loadXMLSetting(GCSettings.ScreenshotsFolder, "ScreenshotsFolder", sizeof(GCSettings.ScreenshotsFolder)); loadXMLSetting(GCSettings.ScreenshotsFolder, "ScreenshotsFolder", sizeof(GCSettings.ScreenshotsFolder));
loadXMLSetting(GCSettings.CoverFolder, "CoverFolder", sizeof(GCSettings.CoverFolder)); loadXMLSetting(GCSettings.CoverFolder, "CoverFolder", sizeof(GCSettings.CoverFolder));
loadXMLSetting(GCSettings.ArtworkFolder, "ArtworkFolder", sizeof(GCSettings.ArtworkFolder)); loadXMLSetting(GCSettings.ArtworkFolder, "ArtworkFolder", sizeof(GCSettings.ArtworkFolder));
loadXMLSetting(GCSettings.ImageFolder, "ImageFolder", sizeof(GCSettings.ImageFolder));
// Network Settings // Network Settings
@ -433,7 +431,6 @@ DefaultSettings ()
sprintf (GCSettings.ScreenshotsFolder, "%s/screenshots", APPFOLDER); // Path to screenshot files sprintf (GCSettings.ScreenshotsFolder, "%s/screenshots", APPFOLDER); // Path to screenshot files
sprintf (GCSettings.CoverFolder, "%s/covers", APPFOLDER); // Path to cover files sprintf (GCSettings.CoverFolder, "%s/covers", APPFOLDER); // Path to cover files
sprintf (GCSettings.ArtworkFolder, "%s/artwork", APPFOLDER); // Path to artwork files sprintf (GCSettings.ArtworkFolder, "%s/artwork", APPFOLDER); // Path to artwork files
sprintf (GCSettings.ImageFolder, "%s/screenshots", APPFOLDER);
GCSettings.AutoLoad = 1; GCSettings.AutoLoad = 1;
GCSettings.AutoSave = 1; GCSettings.AutoSave = 1;

10
source/snes9xgx.cpp
View File

@ -558,3 +558,13 @@ int main(int argc, char *argv[])
} // emulation loop } // emulation loop
} // main loop } // main loop
} }
char* ImageFolder()
{
switch(GCSettings.PreviewImage)
{
case 1 : return GCSettings.CoverFolder; break;
case 2 : return GCSettings.ArtworkFolder; break;
default: return GCSettings.ScreenshotsFolder; break;
}
}

3
source/snes9xgx.h
View File

@ -92,7 +92,6 @@ struct SGCSettings{
char ScreenshotsFolder[MAXPATHLEN]; // Path to screenshots files char ScreenshotsFolder[MAXPATHLEN]; // Path to screenshots files
char CoverFolder[MAXPATHLEN]; // Path to cover files char CoverFolder[MAXPATHLEN]; // Path to cover files
char ArtworkFolder[MAXPATHLEN]; // Path to artwork files char ArtworkFolder[MAXPATHLEN]; // Path to artwork files
char ImageFolder[MAXPATHLEN]; // Saved image folder path
int AutoloadGame; int AutoloadGame;
char smbip[80]; char smbip[80];
@ -123,6 +122,8 @@ struct SGCSettings{
int Interpolation; int Interpolation;
}; };
char* ImageFolder();
void ExitApp(); void ExitApp();
void ShutdownWii(); void ShutdownWii();
bool SupportedIOS(u32 ios); bool SupportedIOS(u32 ios);