OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Attaching and detaching joysticks once again updates the joystick menu.

Browse source 
SVN r1684 (trunk)
This commit is contained in:
Randy Heit 2009-06-27 01:36:10 +00:00
commit a687a61c76
4 changed files with 42 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/m_options.cpp
View file

@ -291,7 +291,6 @@ menu_t MouseMenu =
#define SELECTED_JOYSTICK (Joysticks[JoystickItems[1].a.joyselection])
EXTERN_CVAR (Bool, use_joystick)
void UpdateJoystickMenu();
#if 0
EXTERN_CVAR (Float, joy_speedmultiplier)
@ -2460,7 +2459,7 @@ void M_OptResponder (event_t *ev)
{
item->a.joyselection = item->e.joyvalues->Size() - 1;
}
UpdateJoystickMenu();
UpdateJoystickMenu(NULL);
S_Sound(CHAN_VOICE|CHAN_UI, "menu/change", 1, ATTN_NONE);
break;
@ -2666,7 +2665,7 @@ void M_OptResponder (event_t *ev)
{
item->a.joyselection = 0;
}
UpdateJoystickMenu();
UpdateJoystickMenu(NULL);
S_Sound(CHAN_VOICE | CHAN_UI, "menu/change", 1, ATTN_NONE);
break;
@ -3092,7 +3091,7 @@ CCMD (menu_mouse)
MouseOptions ();
}
void UpdateJoystickMenu ()
void UpdateJoystickMenu(IJoystickConfig *selected)
{
int i;
menuitem_t item = { whitetext };
@ -3109,6 +3108,21 @@ void UpdateJoystickMenu ()
}
JoystickItems.Clear();
I_GetJoysticks(Joysticks);
if ((unsigned)itemnum >= Joysticks.Size())
{
itemnum = Joysticks.Size() - 1;
}
if (selected != NULL)
{
for (i = 0; (unsigned)i < Joysticks.Size(); ++i)
{
if (Joysticks[i] == selected)
{
itemnum = i;
break;
}
}
}
if (Joysticks.Size() == 0)
{
item.type = redtext;
@ -3269,7 +3283,7 @@ void UpdateJoystickMenu ()
static void JoystickOptions ()
{
UpdateJoystickMenu ();
UpdateJoystickMenu (NULL);
M_SwitchMenu (&JoystickMenu);
}