From 9cec9fbe97f3d313cfdeac24302f2f08d8aa6e7c Mon Sep 17 00:00:00 2001 From: ashifolfi Date: Sat, 26 Nov 2022 15:34:32 -0500 Subject: [PATCH 1/2] fix NONET builds --- src/d_clisrv.c | 5 +++++ 1 file changed, 5 insertions(+) mode change 100644 => 100755 src/d_clisrv.c diff --git a/src/d_clisrv.c b/src/d_clisrv.c old mode 100644 new mode 100755 index 95f946417..2beb424ab --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2437,12 +2437,17 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic D_ProcessEvents(); //needed for menu system to receive inputs else { +#ifndef NONET // my hand has been forced and I am dearly sorry for this awful hack :vomit: for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1)) { if (!Snake_Joy_Grabber(&events[eventtail])) G_MapEventsToControls(&events[eventtail]); } +#else // woopsie doodles forgot to disable the above in NONET builds - ashi + for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1)) + G_MapEventsToControls(&events[eventtail]); +#endif } if (gamekeydown[KEY_ESCAPE] || gamekeydown[KEY_JOY1+1] || cl_mode == CL_ABORTED) From 4e303ec59dab2f349368504df589db4c08ed0531 Mon Sep 17 00:00:00 2001 From: Zwip-Zwap Zapony Date: Sat, 26 Nov 2022 20:46:25 +0000 Subject: [PATCH 2/2] better ifdef --- src/d_clisrv.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index 2beb424ab..ac486faea 100755 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2437,17 +2437,14 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic D_ProcessEvents(); //needed for menu system to receive inputs else { -#ifndef NONET // my hand has been forced and I am dearly sorry for this awful hack :vomit: for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1)) { +#ifndef NONET if (!Snake_Joy_Grabber(&events[eventtail])) +#endif G_MapEventsToControls(&events[eventtail]); } -#else // woopsie doodles forgot to disable the above in NONET builds - ashi - for (; eventtail != eventhead; eventtail = (eventtail+1) & (MAXEVENTS-1)) - G_MapEventsToControls(&events[eventtail]); -#endif } if (gamekeydown[KEY_ESCAPE] || gamekeydown[KEY_JOY1+1] || cl_mode == CL_ABORTED)