Skip to content

Commit

Permalink
Remove "Force no DVD drive mode" config option
Browse files Browse the repository at this point in the history 
We detect the presence of a drive at startup, this option interferes
with that
  • Loading branch information
@9ary
9ary committed Apr 21, 2017
1 parent b3c7c47 commit af8b9ea
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 25 deletions.
5 changes: 0 additions & 5 deletions cube/swiss/source/config/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@ int config_update_file() {
fwrite(txtbuffer, 1, strlen(txtbuffer), fp);
sprintf(txtbuffer, "Enable Debug=%s\r\n",(configSwissSettings.debugUSB ? "Yes":"No"));
fwrite(txtbuffer, 1, strlen(txtbuffer), fp);
sprintf(txtbuffer, "Force No DVD Drive Mode=%s\r\n",(configSwissSettings.hasDVDDrive ? "No":"Yes"));
fwrite(txtbuffer, 1, strlen(txtbuffer), fp);
sprintf(txtbuffer, "Hide Unknown file types=%s\r\n",(configSwissSettings.hideUnknownFileTypes ? "Yes":"No"));
fwrite(txtbuffer, 1, strlen(txtbuffer), fp);
sprintf(txtbuffer, "Stop DVD Motor on startup=%s\r\n",(configSwissSettings.stopMotor ? "Yes":"No"));
Expand Down Expand Up @@ -281,9 +279,6 @@ void config_parse(char *configData) {
else if(!strcmp("Enable Debug", name)) {
configSwissSettings.debugUSB = !strcmp("Yes", value) ? 1:0;
}
else if(!strcmp("Force No DVD Drive Mode", name)) {
configSwissSettings.hasDVDDrive = !strcmp("No", value) ? 1:0;
}
else if(!strcmp("Hide Unknown file types", name)) {
configSwissSettings.hideUnknownFileTypes = !strcmp("Yes", value) ? 1:0;
}
Expand Down
35 changes: 15 additions & 20 deletions cube/swiss/source/gui/settings.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ char *igrTypeStr[] = {"Disabled", "Reboot", "boot.bin", "USB Flash"};
syssram* sram;

// Number of settings (including Back, Next, Save, Exit buttons) per page
int settings_count_pp[3] = {7, 10, 8};
int settings_count_pp[3] = {7, 9, 8};

void refreshSRAM() {
sram = __SYS_LockSram();
Expand Down Expand Up @@ -72,18 +72,16 @@ void settings_draw_page(int page_num, int option, file_handle *file) {
WriteFont(30, 65, "Advanced Settings (2/3):");
WriteFontStyled(30, 110, "Enable USB Gecko Debug via Slot B:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 110, -1, 135, swissSettings.debugUSB ? "Yes":"No", option == 0 ? B_SELECTED:B_NOSELECT,-1);
WriteFontStyled(30, 140, "Force No DVD Drive Mode:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 140, -1, 165, swissSettings.hasDVDDrive ? "No":"Yes", option == 1 ? B_SELECTED:B_NOSELECT,-1);
WriteFontStyled(30, 170, "Hide Unknown file types:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 170, -1, 195, swissSettings.hideUnknownFileTypes ? "Yes":"No", option == 2 ? B_SELECTED:B_NOSELECT,-1);
WriteFontStyled(30, 200, "Stop DVD Motor on startup:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 200, -1, 225, swissSettings.stopMotor ? "Yes":"No", option == 3 ? B_SELECTED:B_NOSELECT,-1);
WriteFontStyled(30, 230, "Enable WiiRD debugging in Games:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 230, -1, 255, swissSettings.wiirdDebug ? "Yes":"No", option == 4 ? B_SELECTED:B_NOSELECT,-1);
WriteFontStyled(30, 260, "Enable File Management:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 260, -1, 285, swissSettings.enableFileManagement ? "Yes":"No", option == 5 ? B_SELECTED:B_NOSELECT,-1);
WriteFontStyled(30, 290, "Auto-load all cheats:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 290, -1, 315, swissSettings.autoCheats ? "Yes":"No", option == 6 ? B_SELECTED:B_NOSELECT,-1);
WriteFontStyled(30, 140, "Hide Unknown file types:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 140, -1, 165, swissSettings.hideUnknownFileTypes ? "Yes":"No", option == 1 ? B_SELECTED:B_NOSELECT,-1);
WriteFontStyled(30, 170, "Stop DVD Motor on startup:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 170, -1, 195, swissSettings.stopMotor ? "Yes":"No", option == 2 ? B_SELECTED:B_NOSELECT,-1);
WriteFontStyled(30, 200, "Enable WiiRD debugging in Games:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 200, -1, 225, swissSettings.wiirdDebug ? "Yes":"No", option == 3 ? B_SELECTED:B_NOSELECT,-1);
WriteFontStyled(30, 230, "Enable File Management:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 230, -1, 255, swissSettings.enableFileManagement ? "Yes":"No", option == 4 ? B_SELECTED:B_NOSELECT,-1);
WriteFontStyled(30, 260, "Auto-load all cheats:", 1.0f, false, defaultColor);
DrawSelectableButton(500, 260, -1, 285, swissSettings.autoCheats ? "Yes":"No", option == 5 ? B_SELECTED:B_NOSELECT,-1);
}
else if(page_num == 2) {
WriteFont(30, 65, "Current Game Settings (3/3):");
Expand Down Expand Up @@ -151,21 +149,18 @@ void settings_toggle(int page, int option, int direction, file_handle *file) {
swissSettings.debugUSB ^= 1;
break;
case 1:
swissSettings.hasDVDDrive ^= 1;
break;
case 2:
swissSettings.hideUnknownFileTypes ^= 1;
break;
case 3:
case 2:
swissSettings.stopMotor ^= 1;
break;
case 4:
case 3:
swissSettings.wiirdDebug ^=1;
break;
case 5:
case 4:
swissSettings.enableFileManagement ^=1;
break;
case 6:
case 5:
swissSettings.autoCheats ^=1;
break;
}
Expand Down

0 comments on commit af8b9ea

Please sign in to comment.