Handle joystick port presistently in the menus

This commit is contained in:
simon.kagstrom 2009-01-05 13:28:44 +00:00
parent ec78d92547
commit 7173ef72dc
2 changed files with 10 additions and 7 deletions

View File

@ -418,9 +418,13 @@ void C64::VBlank(bool draw_frame)
}
if (this->have_a_break) {
int submenus[1];
int opt = menu_select(real_screen, &this->main_menu, submenus);
int opt;
Prefs *np = Frodo::reload_prefs();
submenus[0] = np->JoystickSwap == true ? 1 : 0;
opt = menu_select(real_screen, &this->main_menu, submenus);
switch(opt)
{
case 0: /* Insert disc/tape */

View File

@ -336,6 +336,9 @@ int menu_select(SDL_Surface *screen, menu_t *p_menu,
{
int ret = -1;
for (int i = 0; i < p_menu->n_submenus; i++)
p_menu->p_submenus[i].sel = p_submenus[i];
while(1)
{
uint32_t keys;
@ -362,12 +365,8 @@ int menu_select(SDL_Surface *screen, menu_t *p_menu,
ret = p_menu->cur_sel;
int i;
if (!is_submenu_title(p_menu, ret))
{
for (i=0; i<p_menu->n_submenus; i++)
p_submenus[i] = p_menu->p_submenus[i].sel;
p_menu->cur_sel = 0;
}
for (i=0; i<p_menu->n_submenus; i++)
p_submenus[i] = p_menu->p_submenus[i].sel;
break;
}
}