From 9e8d79f2469f6e52954e4d261b6a84e8032b524e Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 19 Aug 2024 14:14:17 +0300 Subject: [PATCH 1/2] Fix compilation when SDL_VERSION_ATLEAST(2,0,18) is false (if its false then 'else' statement would not be valid) --- src/sdl/i_video.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c index bf7c30c7b..a467187bc 100644 --- a/src/sdl/i_video.c +++ b/src/sdl/i_video.c @@ -2480,9 +2480,8 @@ static void Impl_SetVsync(void) if (renderer) SDL_RenderSetVSync(renderer, cv_vidwait.value); #endif - } #ifdef HWRENDER - else if (rendermode == render_opengl && sdlglcontext != NULL && SDL_GL_GetCurrentContext() == sdlglcontext) + if (!renderer && rendermode == render_opengl && sdlglcontext != NULL && SDL_GL_GetCurrentContext() == sdlglcontext) { SDL_GL_SetSwapInterval(cv_vidwait.value ? 1 : 0); } From af18e2b7d10c78f684cecc45deb21a8d103ff4eb Mon Sep 17 00:00:00 2001 From: Indev Date: Mon, 19 Aug 2024 14:14:59 +0300 Subject: [PATCH 2/2] Don't execute exitgame command on dedicated servers --- src/d_netcmd.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 790bc2850..62072d9ee 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -5693,6 +5693,12 @@ void Command_ExitGame_f(void) { INT32 i; + if (dedicated) + { + CONS_Printf("This command cannot be used on dedicated server\n"); + return; + } + D_QuitNetGame(); CL_Reset(); CV_ClearChangedFlags();