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

HandleGamepadDeviceEvents: Call at all junctures where event_t are digested

Browse source 
Permits controllers to actually be added when starting with -server
This commit is contained in:
toaster 2023-03-19 17:02:37 +00:00
parent dc63847e14
commit 5a7f7b58f0
6 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_clisrv.c
View file

@ -1968,6 +1968,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
{
for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1))
{
HandleGamepadDeviceEvents(&events[eventtail]);
G_MapEventsToControls(&events[eventtail]);
}

2
src/d_main.c
View file

@ -203,7 +203,7 @@ static void HandleGamepadDeviceRemoved(event_t *ev)
}
/// Respond to added/removed device events, for bookkeeping available gamepads.
static void HandleGamepadDeviceEvents(event_t *ev)
void HandleGamepadDeviceEvents(event_t *ev)
{
I_Assert(ev != NULL);

2
src/g_input.h
View file

@ -165,6 +165,8 @@ boolean G_IsDeviceResponding(INT32 device);
void G_SetDeviceResponding(INT32 device, boolean responding);
void G_ResetAllDeviceResponding(void);
void HandleGamepadDeviceEvents(event_t *ev);
// remaps the input event to a game control.
void G_MapEventsToControls(event_t *ev);

5
src/sdl/i_system.c
View file

@ -871,10 +871,15 @@ INT32 I_GetKey (void)
event_t *ev;
INT32 rc = 0;
G_ResetAllDeviceResponding();
// return the first keypress from the event queue
for (; eventtail != eventhead; eventtail = (eventtail+1)&(MAXEVENTS-1))
{
ev = &events[eventtail];
HandleGamepadDeviceEvents(ev);
if (ev->type == ev_keydown || ev->type == ev_console)
{
rc = ev->data1;

5
src/sdl12/i_system.c
View file

@ -910,10 +910,15 @@ INT32 I_GetKey (void)
event_t *ev;
INT32 rc = 0;
G_ResetAllDeviceResponding();
// return the first keypress from the event queue
for (; eventtail != eventhead; eventtail = (eventtail+1)&(MAXEVENTS-1))
{
ev = &events[eventtail];
HandleGamepadDeviceEvents(ev);
if (ev->type == ev_keydown || ev->type == ev_console)
{
rc = ev->data1;

3
src/win32ce/win_sys.c
View file

@ -3067,9 +3067,12 @@ INT32 I_GetKey(void)
{
event_t *ev;
G_ResetAllDeviceResponding();
if (eventtail != eventhead)
{
ev = &events[eventtail];
HandleGamepadDeviceEvents(ev);
eventtail = (eventtail+1) & (MAXEVENTS-1);
if (ev->type == ev_keydown || ev->type == ev_console)
return ev->data1;