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

Port option to not append Auto to save filenames from vbagx and fceugx (#808)

Browse Source
This commit is contained in:
Corey Garst 2019-01-29 22:31:25 -05:00 committed by dborth
parent de067e5e6b
commit e27e792485
5 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/filebrowser.cpp
View File

@ -290,7 +290,10 @@ bool MakeFilePath(char filepath[], int type, char * filename, int filenum)
if(filenum == -1) if(filenum == -1)
sprintf(file, "%s.%s", filename, ext); sprintf(file, "%s.%s", filename, ext);
else if(filenum == 0) else if(filenum == 0)
sprintf(file, "%s Auto.%s", filename, ext); if (GCSettings.AppendAuto <= 0)
sprintf(file, "%s.%s", filename, ext);
else
sprintf(file, "%s Auto.%s", filename, ext);
else else
sprintf(file, "%s %i.%s", filename, filenum, ext); sprintf(file, "%s %i.%s", filename, filenum, ext);
} }

10
source/menu.cpp
View File

@ -3707,6 +3707,7 @@ static int MenuSettingsFile()
sprintf(options.name[i++], "Artwork Folder"); sprintf(options.name[i++], "Artwork Folder");
sprintf(options.name[i++], "Auto Load"); sprintf(options.name[i++], "Auto Load");
sprintf(options.name[i++], "Auto Save"); sprintf(options.name[i++], "Auto Save");
sprintf(options.name[i++], "Append Auto to .SAV Files");
options.length = i; options.length = i;
for(i=0; i < options.length; i++) for(i=0; i < options.length; i++)
@ -3800,6 +3801,12 @@ static int MenuSettingsFile()
if (GCSettings.AutoSave > 3) if (GCSettings.AutoSave > 3)
GCSettings.AutoSave = 0; GCSettings.AutoSave = 0;
break; break;
case 10:
GCSettings.AppendAuto++;
if (GCSettings.AppendAuto > 1)
GCSettings.AppendAuto = 0;
break;
} }
if(ret >= 0 || firstRun) if(ret >= 0 || firstRun)
@ -3874,6 +3881,9 @@ static int MenuSettingsFile()
else if (GCSettings.AutoSave == 2) sprintf (options.value[9],"Snapshot"); else if (GCSettings.AutoSave == 2) sprintf (options.value[9],"Snapshot");
else if (GCSettings.AutoSave == 3) sprintf (options.value[9],"Both"); else if (GCSettings.AutoSave == 3) sprintf (options.value[9],"Both");
if (GCSettings.AppendAuto == 0) sprintf (options.value[10], "Off");
else if (GCSettings.AppendAuto == 1) sprintf (options.value[10], "On");
optionBrowser.TriggerUpdate(); optionBrowser.TriggerUpdate();
} }

2
source/preferences.cpp
View File

@ -128,6 +128,7 @@ preparePrefsData ()
createXMLSetting("LoadFolder", "Load Folder", GCSettings.LoadFolder); createXMLSetting("LoadFolder", "Load Folder", GCSettings.LoadFolder);
createXMLSetting("LastFileLoaded", "Last File Loaded", GCSettings.LastFileLoaded); createXMLSetting("LastFileLoaded", "Last File Loaded", GCSettings.LastFileLoaded);
createXMLSetting("SaveFolder", "Save Folder", GCSettings.SaveFolder); createXMLSetting("SaveFolder", "Save Folder", GCSettings.SaveFolder);
createXMLSetting("AppendAuto", "Append Auto to .SAV Files", toStr(GCSettings.AppendAuto));
createXMLSetting("CheatFolder", "Cheats Folder", GCSettings.CheatFolder); createXMLSetting("CheatFolder", "Cheats Folder", GCSettings.CheatFolder);
createXMLSetting("ScreenshotsFolder", "Screenshots Folder", GCSettings.ScreenshotsFolder); createXMLSetting("ScreenshotsFolder", "Screenshots Folder", GCSettings.ScreenshotsFolder);
createXMLSetting("CoverFolder", "Covers Folder", GCSettings.CoverFolder); createXMLSetting("CoverFolder", "Covers Folder", GCSettings.CoverFolder);
@ -312,6 +313,7 @@ decodePrefsData ()
loadXMLSetting(GCSettings.LoadFolder, "LoadFolder", sizeof(GCSettings.LoadFolder)); loadXMLSetting(GCSettings.LoadFolder, "LoadFolder", sizeof(GCSettings.LoadFolder));
loadXMLSetting(GCSettings.LastFileLoaded, "LastFileLoaded", sizeof(GCSettings.LastFileLoaded)); loadXMLSetting(GCSettings.LastFileLoaded, "LastFileLoaded", sizeof(GCSettings.LastFileLoaded));
loadXMLSetting(GCSettings.SaveFolder, "SaveFolder", sizeof(GCSettings.SaveFolder)); loadXMLSetting(GCSettings.SaveFolder, "SaveFolder", sizeof(GCSettings.SaveFolder));
loadXMLSetting(&GCSettings.AppendAuto, "AppendAuto");
loadXMLSetting(GCSettings.CheatFolder, "CheatFolder", sizeof(GCSettings.CheatFolder)); loadXMLSetting(GCSettings.CheatFolder, "CheatFolder", sizeof(GCSettings.CheatFolder));
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));

1
source/snes9xgx.h
View File

@ -85,6 +85,7 @@ struct SGCSettings{
int AutoSave; int AutoSave;
int LoadMethod; // For ROMS: Auto, SD, DVD, USB, Network (SMB) int LoadMethod; // For ROMS: Auto, SD, DVD, USB, Network (SMB)
int SaveMethod; // For SRAM, Freeze, Prefs: Auto, SD, USB, SMB int SaveMethod; // For SRAM, Freeze, Prefs: Auto, SD, USB, SMB
int AppendAuto; // 0 - no, 1 - yes
char LoadFolder[MAXPATHLEN]; // Path to game files char LoadFolder[MAXPATHLEN]; // Path to game files
char LastFileLoaded[MAXPATHLEN]; // Last file loaded filename char LastFileLoaded[MAXPATHLEN]; // Last file loaded filename
char SaveFolder[MAXPATHLEN]; // Path to save files char SaveFolder[MAXPATHLEN]; // Path to save files

3
source/sram.cpp
View File

@ -85,6 +85,9 @@ LoadSRAMAuto (bool silent)
if (LoadSRAM(filepath, silent)) if (LoadSRAM(filepath, silent))
return true; return true;
if (!GCSettings.AppendAuto)
return false;
// look for file with no number or Auto appended // look for file with no number or Auto appended
if(!MakeFilePath(filepath, FILE_SRAM, Memory.ROMFilename, -1)) if(!MakeFilePath(filepath, FILE_SRAM, Memory.ROMFilename, -1))
return false; return false;