Reworked the menus so they're more logically grouped;

Removed the lone Misc menu and mvoed Status to Settings;
Added a SCSI CD-ROM option to the menu;
Removed the atapi_cdrom_enabled option and replaced any usage of it with !scsi_cdrom_enabled;
Disabling/enabling the CD-ROM drive is now separate from the drive's contents;
The tertiary IDE controller now never gets enabled is the CD-ROM drive is either disabled or SCSI.
This commit is contained in:
OBattler
2016-11-13 05:39:21 +01:00
parent 36f19628a1
commit e46631e47b
7 changed files with 95 additions and 61 deletions

View File

@@ -60,7 +60,7 @@ int window_w, window_h, window_x, window_y, window_remember;
int start_in_fullscreen = 0;
int frame = 0;
int scsi_cdrom_enabled, atapi_cdrom_enabled;
int scsi_cdrom_enabled;
int cdrom_enabled;
int CPUID;
int vid_resize, vid_api;
@@ -670,7 +670,6 @@ void loadconfig(char *fn)
old_cdrom_drive = cdrom_drive;
cdrom_enabled = config_get_int(NULL, "cdrom_enabled", 0);
atapi_cdrom_enabled = config_get_int(NULL, "atapi_cdrom_enabled", 1);
atapi_cdrom_channel = config_get_int(NULL, "atapi_cdrom_channel", 2);
scsi_cdrom_enabled = config_get_int(NULL, "scsi_cdrom_enabled", 0);
@@ -816,7 +815,6 @@ void saveconfig()
config_set_int(NULL, "cdrom_drive", cdrom_drive);
config_set_int(NULL, "cdrom_enabled", cdrom_enabled);
config_set_int(NULL, "atapi_cdrom_enabled", atapi_cdrom_enabled);
config_set_int(NULL, "atapi_cdrom_channel", atapi_cdrom_channel);
config_set_int(NULL, "scsi_cdrom_enabled", scsi_cdrom_enabled);