The-Homebrew-Cloud/uae-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/uae-wii.git synced 2024-11-25 12:06:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved NTSC/PAL menu, added init usb message

Browse Source
This commit is contained in:
fabio.olimpieri 2011-10-29 08:40:55 +00:00
parent 2c44e57411
commit cb8ac73b12
1 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
src/gui-sdl/gui-sdl.c
View File

@ -70,11 +70,14 @@ static const char *hardware_messages[] = {
/*00*/ "Amiga model", /*00*/ "Amiga model",
/*01*/ "^|A1000|A500|A600|A1200|Custom", /*01*/ "^|A1000|A500|A600|A1200|Custom",
/*02*/ " ", /*02*/ " ",
/*03*/ "Memory options", /*03*/ "Video system chipset",
/*04*/ " ", /*04*/ "^|PAL|NTSC",
/*05*/ "CPU/Chipset options", /*05*/ " ",
/*06*/ " ", /*06*/ "CPU/Chipset options",
/*07*/ "Change ROM", /*07*/ " ",
/*08*/ "Memory options",
/*09*/ " ",
/*10*/ "Change ROM",
NULL NULL
}; };
@ -82,14 +85,14 @@ static const char *memory_messages[] = {
/*00*/ "Chip mem", /*00*/ "Chip mem",
/*01*/ "^|512K|1M|2M", /*01*/ "^|512K|1M|2M",
/*02*/ " ", /*02*/ " ",
/*02*/ "Slow mem", /*03*/ "Slow mem",
/*03*/ "^|None|256K|512K|1M|1.8M", /*04*/ "^|None|256K|512K|1M|1.8M",
/*02*/ " ", /*05*/ " ",
/*04*/ "Fast mem", /*06*/ "Fast mem",
/*05*/ "^|None|1M|2M|4M|8M", /*07*/ "^|None|1M|2M|4M|8M",
/*02*/ " ", /*08*/ " ",
/*06*/ "Zorro3 mem", /*09*/ "Zorro3 mem",
/*07*/ "^|None|1M|2M|4M|8M|16M|32M", /*10*/ "^|None|1M|2M|4M|8M|16M|32M",
NULL NULL
}; };
@ -114,19 +117,16 @@ static const int chipset_mask_table[] = {0, CSMASK_ECS_AGNUS,
static const char *emulation_messages[] = { static const char *emulation_messages[] = {
/*03*/ "Emulation accuracy", /*00*/ "Emulation accuracy",
/*04*/ "^|Fast|Compatible|Cycle-exact", /*01*/ "^|Fast|Compatible|Cycle-exact",
/*00*/ "CPU to chipset speed", /*02*/ "CPU to chipset speed",
/*01*/ "^|max|90%|80%|60%|40%|20%|0%", /*03*/ "^|max|90%|80%|60%|40%|20%|0%",
/*02*/ "Framerate", /*04*/ "Framerate",
/*03*/ "^|100%|50%|33%|25%|12%|custom", /*05*/ "^|100%|50%|33%|25%|12%|custom",
/*04*/ "Floppy speed", /*06*/ "Floppy speed",
/*05*/ "^|normal|turbo|400%|800%", /*07*/ "^|normal|turbo|400%|800%",
/*04*/ "Sound interpolation", /*08*/ "Sound interpolation",
/*05*/ "^|none|rh|crux|sinc", /*09*/ "^|none|rh|crux|sinc",
/*02*/ "Video system",
/*03*/ "^|PAL|NTSC",
NULL NULL
}; };
@ -506,7 +506,7 @@ msgInfo("Configurations saved",3000,NULL);
static void emulation_options(void) static void emulation_options(void)
{ {
int submenus[6]; int submenus[5];
int opt; int opt;
memset(submenus, 0, sizeof(submenus)); memset(submenus, 0, sizeof(submenus));
@ -516,8 +516,6 @@ static void emulation_options(void)
submenus[2] = get_gfx_framerate(); submenus[2] = get_gfx_framerate();
submenus[3] = get_floppy_speed(); submenus[3] = get_floppy_speed();
submenus[4] = changed_prefs.sound_interpol; submenus[4] = changed_prefs.sound_interpol;
submenus[5] = changed_prefs.ntscmode;
opt = menu_select_title("Emulation options menu", opt = menu_select_title("Emulation options menu",
emulation_messages, submenus); emulation_messages, submenus);
@ -530,7 +528,6 @@ static void emulation_options(void)
set_gfx_framerate(submenus[2]); set_gfx_framerate(submenus[2]);
set_floppy_speed(submenus[3]); set_floppy_speed(submenus[3]);
changed_prefs.sound_interpol = submenus[4]; changed_prefs.sound_interpol = submenus[4];
changed_prefs.ntscmode = submenus[5];
//prefs_has_changed = 1; //prefs_has_changed = 1;
} }
@ -678,13 +675,13 @@ static void hardware_options(void)
{ {
int opt; int opt;
int cur_model; int cur_model;
int submenus[1]; int submenus[2];
do do
{ {
cur_model = get_model(); cur_model = get_model();
submenus[0] = cur_model; submenus[0] = cur_model;
submenus[1] = changed_prefs.ntscmode;
opt = menu_select_title("Hardware option menu", opt = menu_select_title("Hardware option menu",
hardware_messages, submenus); hardware_messages, submenus);
@ -703,18 +700,20 @@ static void hardware_options(void)
} }
} }
changed_prefs.ntscmode = submenus[1];
switch(opt) switch(opt)
{ {
case 3: case 6:
memory_options(); break;
case 5:
cpu_chipset_options(); break; cpu_chipset_options(); break;
case 7: case 8:
memory_options(); break;
case 10:
insert_rom(); break; insert_rom(); break;
default: default:
break; break;
} }
} while (opt == 3 || opt == 5 || opt == 7); } while (opt == 6 || opt == 8 || opt == 10);
/* Reset the Amiga if the model has changed */ /* Reset the Amiga if the model has changed */
if (cur_model != submenus[0]) if (cur_model != submenus[0])