thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

G_MapEventsToControls: Fix crash

Browse source 
- If G_GetDeviceGameKeyDownArray returns NULL, bail early.
- Also calls it once for all relevant event types, rather than possibly multiple times.
This commit is contained in:
toaster 2023-03-19 16:59:54 +00:00
parent cd7d4f23c7
commit dc63847e14
1 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/g_input.c
View file

@ -362,6 +362,7 @@ static INT32 AssignDeviceToFirstUnassignedPlayer(INT32 device)
void G_MapEventsToControls(event_t *ev) void G_MapEventsToControls(event_t *ev)
{ {
INT32 i; INT32 i;
INT32 *DeviceGameKeyDownArray;
if (ev->device >= 0) if (ev->device >= 0)
{ {
@ -383,12 +384,17 @@ void G_MapEventsToControls(event_t *ev)
return; return;
} }
DeviceGameKeyDownArray = G_GetDeviceGameKeyDownArray(ev->device);
if (!DeviceGameKeyDownArray)
return;
switch (ev->type) switch (ev->type)
{ {
case ev_keydown: case ev_keydown:
if (ev->data1 < NUMINPUTS) if (ev->data1 < NUMINPUTS)
{ {
G_GetDeviceGameKeyDownArray(ev->device)[ev->data1] = JOYAXISRANGE; DeviceGameKeyDownArray[ev->data1] = JOYAXISRANGE;
if (AutomaticControllerReassignmentIsAllowed(ev->device)) if (AutomaticControllerReassignmentIsAllowed(ev->device))
{ {
@ -410,7 +416,7 @@ void G_MapEventsToControls(event_t *ev)
case ev_keyup: case ev_keyup:
if (ev->data1 < NUMINPUTS) if (ev->data1 < NUMINPUTS)
{ {
G_GetDeviceGameKeyDownArray(ev->device)[ev->data1] = 0; DeviceGameKeyDownArray[ev->data1] = 0;
} }
#ifdef PARANOIA #ifdef PARANOIA
else else
@ -425,28 +431,28 @@ void G_MapEventsToControls(event_t *ev)
if (ev->data2 < 0) if (ev->data2 < 0)
{ {
// Left // Left
G_GetDeviceGameKeyDownArray(ev->device)[KEY_MOUSEMOVE + 2] = abs(ev->data2); DeviceGameKeyDownArray[KEY_MOUSEMOVE + 2] = abs(ev->data2);
G_GetDeviceGameKeyDownArray(ev->device)[KEY_MOUSEMOVE + 3] = 0; DeviceGameKeyDownArray[KEY_MOUSEMOVE + 3] = 0;
} }
else else
{ {
// Right // Right
G_GetDeviceGameKeyDownArray(ev->device)[KEY_MOUSEMOVE + 2] = 0; DeviceGameKeyDownArray[KEY_MOUSEMOVE + 2] = 0;
G_GetDeviceGameKeyDownArray(ev->device)[KEY_MOUSEMOVE + 3] = abs(ev->data2); DeviceGameKeyDownArray[KEY_MOUSEMOVE + 3] = abs(ev->data2);
} }
// Y axis // Y axis
if (ev->data3 < 0) if (ev->data3 < 0)
{ {
// Up // Up
G_GetDeviceGameKeyDownArray(ev->device)[KEY_MOUSEMOVE] = abs(ev->data3); DeviceGameKeyDownArray[KEY_MOUSEMOVE] = abs(ev->data3);
G_GetDeviceGameKeyDownArray(ev->device)[KEY_MOUSEMOVE + 1] = 0; DeviceGameKeyDownArray[KEY_MOUSEMOVE + 1] = 0;
} }
else else
{ {
// Down // Down
G_GetDeviceGameKeyDownArray(ev->device)[KEY_MOUSEMOVE] = 0; DeviceGameKeyDownArray[KEY_MOUSEMOVE] = 0;
G_GetDeviceGameKeyDownArray(ev->device)[KEY_MOUSEMOVE + 1] = abs(ev->data3); DeviceGameKeyDownArray[KEY_MOUSEMOVE + 1] = abs(ev->data3);
} }
break; break;
@ -468,12 +474,12 @@ void G_MapEventsToControls(event_t *ev)
if (ev->data2 != INT32_MAX) if (ev->data2 != INT32_MAX)
{ {
G_GetDeviceGameKeyDownArray(ev->device)[KEY_AXIS1 + (JOYANALOGS * 4) + (i * 2)] = max(0, ev->data2); DeviceGameKeyDownArray[KEY_AXIS1 + (JOYANALOGS * 4) + (i * 2)] = max(0, ev->data2);
} }
if (ev->data3 != INT32_MAX) if (ev->data3 != INT32_MAX)
{ {
G_GetDeviceGameKeyDownArray(ev->device)[KEY_AXIS1 + (JOYANALOGS * 4) + (i * 2) + 1] = max(0, ev->data3); DeviceGameKeyDownArray[KEY_AXIS1 + (JOYANALOGS * 4) + (i * 2) + 1] = max(0, ev->data3);
} }
} }
else else
@ -484,14 +490,14 @@ void G_MapEventsToControls(event_t *ev)
if (ev->data2 < 0) if (ev->data2 < 0)
{ {
// Left // Left
G_GetDeviceGameKeyDownArray(ev->device)[KEY_AXIS1 + (i * 4)] = abs(ev->data2); DeviceGameKeyDownArray[KEY_AXIS1 + (i * 4)] = abs(ev->data2);
G_GetDeviceGameKeyDownArray(ev->device)[KEY_AXIS1 + (i * 4) + 1] = 0; DeviceGameKeyDownArray[KEY_AXIS1 + (i * 4) + 1] = 0;
} }
else else
{ {
// Right // Right
G_GetDeviceGameKeyDownArray(ev->device)[KEY_AXIS1 + (i * 4)] = 0; DeviceGameKeyDownArray[KEY_AXIS1 + (i * 4)] = 0;
G_GetDeviceGameKeyDownArray(ev->device)[KEY_AXIS1 + (i * 4) + 1] = abs(ev->data2); DeviceGameKeyDownArray[KEY_AXIS1 + (i * 4) + 1] = abs(ev->data2);
} }
} }
@ -500,14 +506,14 @@ void G_MapEventsToControls(event_t *ev)
if (ev->data3 < 0) if (ev->data3 < 0)
{ {
// Up // Up
G_GetDeviceGameKeyDownArray(ev->device)[KEY_AXIS1 + (i * 4) + 2] = abs(ev->data3); DeviceGameKeyDownArray[KEY_AXIS1 + (i * 4) + 2] = abs(ev->data3);
G_GetDeviceGameKeyDownArray(ev->device)[KEY_AXIS1 + (i * 4) + 3] = 0; DeviceGameKeyDownArray[KEY_AXIS1 + (i * 4) + 3] = 0;
} }
else else
{ {
// Down // Down
G_GetDeviceGameKeyDownArray(ev->device)[KEY_AXIS1 + (i * 4) + 2] = 0; DeviceGameKeyDownArray[KEY_AXIS1 + (i * 4) + 2] = 0;
G_GetDeviceGameKeyDownArray(ev->device)[KEY_AXIS1 + (i * 4) + 3] = abs(ev->data3); DeviceGameKeyDownArray[KEY_AXIS1 + (i * 4) + 3] = abs(ev->data3);
} }
} }
} }