stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-18 15:32:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix player 2 not being able to play while the chat is open

Browse source 
Also attempts to fix the d-pad typing characters into the chat box.
This commit is contained in:
wolfy852 2019-01-10 04:04:26 -06:00
parent 41c32be673
commit 73369679f5
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_input.c
View file

@ -120,7 +120,7 @@ void G_MapEventsToControls(event_t *ev)
case ev_joystick2: // buttons are virtual keys case ev_joystick2: // buttons are virtual keys
i = ev->data1; i = ev->data1;
if (i >= JOYAXISSET || menuactive || CON_Ready() || chat_on) if (i >= JOYAXISSET || menuactive)
break; break;
if (ev->data2 != INT32_MAX) joy2xmove[i] = ev->data2; if (ev->data2 != INT32_MAX) joy2xmove[i] = ev->data2;
if (ev->data3 != INT32_MAX) joy2ymove[i] = ev->data3; if (ev->data3 != INT32_MAX) joy2ymove[i] = ev->data3;

4
src/hu_stuff.c
View file

@ -1179,6 +1179,10 @@ boolean HU_Responder(event_t *ev)
|| ev->data1 == KEY_LALT || ev->data1 == KEY_RALT) || ev->data1 == KEY_LALT || ev->data1 == KEY_RALT)
return true; return true;
// Ignore joystick hats
if (ev->data1 >= KEY_HAT1 && ev->data1 <= KEY_HAT1 + 3)
return false;
c = (INT32)ev->data1; c = (INT32)ev->data1;
// I know this looks very messy but this works. If it ain't broke, don't fix it! // I know this looks very messy but this works. If it ain't broke, don't fix it!