This commit is contained in:
dborth 2009-12-02 06:48:50 +00:00
parent 646255157f
commit cba6f19df8
3 changed files with 7 additions and 6 deletions

View File

@ -3412,7 +3412,7 @@ static int MenuSettingsFile()
// correct load/save devices out of bounds // correct load/save devices out of bounds
if(GCSettings.LoadMethod > 4) if(GCSettings.LoadMethod > 4)
GCSettings.LoadMethod = 0; GCSettings.LoadMethod = 0;
if(GCSettings.SaveMethod > 5) if(GCSettings.SaveMethod > 4)
GCSettings.SaveMethod = 0; GCSettings.SaveMethod = 0;
if (GCSettings.LoadMethod == DEVICE_AUTO) sprintf (options.value[0],"Auto Detect"); if (GCSettings.LoadMethod == DEVICE_AUTO) sprintf (options.value[0],"Auto Detect");

View File

@ -29,6 +29,10 @@ struct SGCSettings GCSettings;
***************************************************************************/ ***************************************************************************/
void FixInvalidSettings() void FixInvalidSettings()
{ {
if(GCSettings.LoadMethod > 4)
GCSettings.LoadMethod = DEVICE_AUTO;
if(GCSettings.SaveMethod > 4)
GCSettings.SaveMethod = DEVICE_AUTO;
if(!(GCSettings.zoomHor > 0.5 && GCSettings.zoomHor < 1.5)) if(!(GCSettings.zoomHor > 0.5 && GCSettings.zoomHor < 1.5))
GCSettings.zoomHor = 1.0; GCSettings.zoomHor = 1.0;
if(!(GCSettings.zoomVert > 0.5 && GCSettings.zoomVert < 1.5)) if(!(GCSettings.zoomVert > 0.5 && GCSettings.zoomVert < 1.5))

View File

@ -28,7 +28,7 @@
#define SILENT 1 #define SILENT 1
const char pathPrefix[9][8] = const char pathPrefix[9][8] =
{ "", "sd:/", "usb:/", "dvd:/", "smb:/", "mca:/", "mcb:/", "carda:/", "cardb:/" }; { "", "sd:/", "usb:/", "dvd:/", "smb:/", "carda:/", "cardb:/" };
enum { enum {
DEVICE_AUTO, DEVICE_AUTO,
@ -36,8 +36,6 @@ enum {
DEVICE_USB, DEVICE_USB,
DEVICE_DVD, DEVICE_DVD,
DEVICE_SMB, DEVICE_SMB,
DEVICE_MC_SLOTA,
DEVICE_MC_SLOTB,
DEVICE_SD_SLOTA, DEVICE_SD_SLOTA,
DEVICE_SD_SLOTB DEVICE_SD_SLOTB
}; };
@ -67,7 +65,7 @@ struct SGCSettings{
int AutoLoad; int AutoLoad;
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, Memory Card Slot A, Memory Card Slot B, USB, SMB int SaveMethod; // For SRAM, Freeze, Prefs: Auto, SD, USB, SMB
char LoadFolder[MAXPATHLEN]; // Path to game files char LoadFolder[MAXPATHLEN]; // Path to game files
char SaveFolder[MAXPATHLEN]; // Path to save files char SaveFolder[MAXPATHLEN]; // Path to save files
char CheatFolder[MAXPATHLEN]; // Path to cheat files char CheatFolder[MAXPATHLEN]; // Path to cheat files
@ -79,7 +77,6 @@ struct SGCSettings{
float zoomHor; // horizontal zoom amount float zoomHor; // horizontal zoom amount
float zoomVert; // vertical zoom amount float zoomVert; // vertical zoom amount
int VerifySaves;
int videomode; // 0 - automatic, 1 - NTSC (480i), 2 - Progressive (480p), 3 - PAL (50Hz), 4 - PAL (60Hz) int videomode; // 0 - automatic, 1 - NTSC (480i), 2 - Progressive (480p), 3 - PAL (50Hz), 4 - PAL (60Hz)
int render; // 0 - original, 1 - filtered, 2 - unfiltered int render; // 0 - original, 1 - filtered, 2 - unfiltered
int FilterMethod; // convert to RenderFilter int FilterMethod; // convert to RenderFilter