From f01697bfdb80aff820201e523ebdfe4bc3e98cf3 Mon Sep 17 00:00:00 2001 From: Ashnal Date: Mon, 8 Mar 2021 00:48:15 -0500 Subject: [PATCH 1/2] Prevent the connection from being canceled when in Record Attack Fixes a crash that can happen when starting RA attempts if you press keys/buttons that would cancel a netgame connection --- src/d_clisrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_clisrv.c b/src/d_clisrv.c index f4029ee0..9a3652cc 100644 --- a/src/d_clisrv.c +++ b/src/d_clisrv.c @@ -2468,7 +2468,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic key = I_GetKey(); // Only ESC and non-keyboard keys abort connection - if (key == KEY_ESCAPE || key >= KEY_MOUSE1 || cl_mode == CL_ABORTED) + if (!modeattacking && (key == KEY_ESCAPE || key >= KEY_MOUSE1 || cl_mode == CL_ABORTED)) { CONS_Printf(M_GetText("Network game synchronization aborted.\n")); D_QuitNetGame(); From dbf744845d4aa40fa6c039c9f84fbba92d94b740 Mon Sep 17 00:00:00 2001 From: Hannu Hanhi Date: Fri, 12 Mar 2021 18:52:58 +0200 Subject: [PATCH 2/2] Fix unnecessary texture reloads on respawn in opengl by removing unneeded V_SetPalette calls --- src/st_stuff.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/st_stuff.c b/src/st_stuff.c index 9d726998..33394a81 100644 --- a/src/st_stuff.c +++ b/src/st_stuff.c @@ -232,7 +232,7 @@ void ST_doPaletteStuff(void) { st_palette = palette; - if (rendermode != render_none) + if (rendermode == render_soft) { //V_SetPaletteLump(GetPalette()); // Reset the palette -- is this needed? if (!splitscreen) @@ -392,7 +392,10 @@ static inline void ST_Stop(void) if (st_stopped) return; - V_SetPalette(0); +#ifdef HWRENDER + if (rendermode != render_opengl) +#endif + V_SetPalette(0); st_stopped = true; }