Make back in the menu go to the previous one (if applicable). Also add a small

help message in the main menu
This commit is contained in:
simon.kagstrom 2009-05-24 06:03:09 +00:00
parent fabdbbf5c5
commit 6b01baf105

View File

@ -34,6 +34,8 @@ static const char *main_menu_messages[] = {
/*08*/ "Options", /*08*/ "Options",
/*09*/ "Help", /*09*/ "Help",
/*10*/ "Quit", /*10*/ "Quit",
/*04*/ "#1-------------------------------------",
/*04*/ "#21 - back, 2/A - select",
NULL NULL
}; };
@ -514,6 +516,8 @@ static void amiga_model_options(void)
submenus[0] = cur_model; submenus[0] = cur_model;
submenus[1] = get_emulation_accuracy(); submenus[1] = get_emulation_accuracy();
do
{
opt = menu_select_title("Amiga model menu", opt = menu_select_title("Amiga model menu",
amiga_model_messages, submenus); amiga_model_messages, submenus);
if (opt < 0) if (opt < 0)
@ -528,18 +532,25 @@ static void amiga_model_options(void)
break; break;
} }
switch(opt)
{
case 4:
memory_options(); break;
case 5:
cpu_chipset_options(); break;
case 6:
insert_rom(); break;
default:
break;
}
} while (opt == 4 || opt == 5 || opt == 6);
/* 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])
uae_reset(1); uae_reset(1);
/* Cycle-exact or not? */ /* Cycle-exact or not? */
set_emulation_accuracy(submenus[1]); set_emulation_accuracy(submenus[1]);
if (opt == 4)
memory_options();
else if (opt == 5)
cpu_chipset_options();
else if (opt == 6)
insert_rom();
prefs_has_changed = 1; prefs_has_changed = 1;
} }
@ -677,6 +688,8 @@ void gui_display(int shortcut)
memset(submenus, 0, sizeof(submenus)); memset(submenus, 0, sizeof(submenus));
prefs_has_changed = 0; prefs_has_changed = 0;
do
{
opt = menu_select_title("Main menu", main_menu_messages, submenus); opt = menu_select_title("Main menu", main_menu_messages, submenus);
notice_screen_contents_lost (); notice_screen_contents_lost ();
if (opt < 0) if (opt < 0)
@ -713,6 +726,7 @@ void gui_display(int shortcut)
default: default:
break; break;
} }
} while( opt != 5 && opt != 9 && opt != 10);
if (prefs_has_changed) if (prefs_has_changed)
{ {