diff --git a/source/ngc/menu.cpp b/source/ngc/menu.cpp index 47e1ce4..f7c5a1c 100644 --- a/source/ngc/menu.cpp +++ b/source/ngc/menu.cpp @@ -3412,7 +3412,7 @@ static int MenuSettingsFile() // correct load/save devices out of bounds if(GCSettings.LoadMethod > 4) GCSettings.LoadMethod = 0; - if(GCSettings.SaveMethod > 5) + if(GCSettings.SaveMethod > 4) GCSettings.SaveMethod = 0; if (GCSettings.LoadMethod == DEVICE_AUTO) sprintf (options.value[0],"Auto Detect"); diff --git a/source/ngc/s9xconfig.cpp b/source/ngc/s9xconfig.cpp index 3259301..9c55ff9 100644 --- a/source/ngc/s9xconfig.cpp +++ b/source/ngc/s9xconfig.cpp @@ -29,6 +29,10 @@ struct SGCSettings GCSettings; ***************************************************************************/ 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)) GCSettings.zoomHor = 1.0; if(!(GCSettings.zoomVert > 0.5 && GCSettings.zoomVert < 1.5)) diff --git a/source/ngc/snes9xGX.h b/source/ngc/snes9xGX.h index 83ffb9a..912a862 100644 --- a/source/ngc/snes9xGX.h +++ b/source/ngc/snes9xGX.h @@ -28,7 +28,7 @@ #define SILENT 1 const char pathPrefix[9][8] = -{ "", "sd:/", "usb:/", "dvd:/", "smb:/", "mca:/", "mcb:/", "carda:/", "cardb:/" }; +{ "", "sd:/", "usb:/", "dvd:/", "smb:/", "carda:/", "cardb:/" }; enum { DEVICE_AUTO, @@ -36,8 +36,6 @@ enum { DEVICE_USB, DEVICE_DVD, DEVICE_SMB, - DEVICE_MC_SLOTA, - DEVICE_MC_SLOTB, DEVICE_SD_SLOTA, DEVICE_SD_SLOTB }; @@ -67,7 +65,7 @@ struct SGCSettings{ int AutoLoad; int AutoSave; 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 SaveFolder[MAXPATHLEN]; // Path to save files char CheatFolder[MAXPATHLEN]; // Path to cheat files @@ -79,7 +77,6 @@ struct SGCSettings{ float zoomHor; // horizontal 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 render; // 0 - original, 1 - filtered, 2 - unfiltered int FilterMethod; // convert to RenderFilter