lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

make menu respond to joystick axis events without joyscale having to be 0

Browse source
This commit is contained in:
Monster Iestyn 2018-12-02 21:18:28 +00:00
parent a63ba7084a
commit 13b0e9c3c5
1 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/m_menu.c
View file

@ -2117,28 +2117,34 @@ boolean M_Responder(event_t *ev)
{ {
if (ev->type == ev_joystick && ev->data1 == 0 && joywait < I_GetTime()) if (ev->type == ev_joystick && ev->data1 == 0 && joywait < I_GetTime())
{ {
if (ev->data3 == -1) if (ev->data3 != INT32_MAX)
{
if (ev->data3 < 0)
{ {
ch = KEY_UPARROW; ch = KEY_UPARROW;
joywait = I_GetTime() + NEWTICRATE/7; joywait = I_GetTime() + NEWTICRATE/7;
} }
else if (ev->data3 == 1) else if (ev->data3 > 0)
{ {
ch = KEY_DOWNARROW; ch = KEY_DOWNARROW;
joywait = I_GetTime() + NEWTICRATE/7; joywait = I_GetTime() + NEWTICRATE/7;
} }
}
if (ev->data2 == -1) if (ev->data2 != INT32_MAX)
{
if (ev->data2 < 0)
{ {
ch = KEY_LEFTARROW; ch = KEY_LEFTARROW;
joywait = I_GetTime() + NEWTICRATE/17; joywait = I_GetTime() + NEWTICRATE/17;
} }
else if (ev->data2 == 1) else if (ev->data2 > 0)
{ {
ch = KEY_RIGHTARROW; ch = KEY_RIGHTARROW;
joywait = I_GetTime() + NEWTICRATE/17; joywait = I_GetTime() + NEWTICRATE/17;
} }
} }
}
else if (ev->type == ev_mouse && mousewait < I_GetTime()) else if (ev->type == ev_mouse && mousewait < I_GetTime())
{ {
pmousey += ev->data3; pmousey += ev->data3;