Make M_Responder respond to joy buttons only in-menu (multiplayer bug?)

This commit is contained in:
mazmazz 2018-12-03 03:33:12 -05:00
parent 6dd44ca1de
commit 6bf31492b7

View file

@ -2079,7 +2079,9 @@ boolean M_Responder(event_t *ev)
// (but still allow shift keyup so caps doesn't get stuck) // (but still allow shift keyup so caps doesn't get stuck)
return false; return false;
} }
else if (ev->type == ev_keydown) else if (menuactive)
{
if (ev->type == ev_keydown)
{ {
ch = ev->data1; ch = ev->data1;
@ -2114,9 +2116,7 @@ boolean M_Responder(event_t *ev)
break; break;
} }
} }
else if (menuactive) else 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 == -1)
{ {