From 832ee6beefecbaf792a26863998e8dddb9ecc5fc Mon Sep 17 00:00:00 2001 From: Shpoike Date: Mon, 20 Feb 2023 08:48:54 +0000 Subject: [PATCH] Prevent skyboxes from getting disabled on vid_reloads. --- engine/gl/gl_warp.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/engine/gl/gl_warp.c b/engine/gl/gl_warp.c index c30f96d0e..1e0a4b4db 100644 --- a/engine/gl/gl_warp.c +++ b/engine/gl/gl_warp.c @@ -74,7 +74,10 @@ void R_SetSky(const char *sky) int i; const char *shadername; extern cvar_t r_skyboxname; - Q_strncpyz(cl.skyname, sky, sizeof(cl.skyname)); + if (sky) + Q_strncpyz(cl.skyname, sky, sizeof(cl.skyname)); + else + sky = cl.skyname; if (qrenderer <= QR_NONE) return; //not ready yet... if (*r_skyboxname.string) //override it with the user's preference @@ -259,7 +262,7 @@ static void R_ForceSky_f(void) } void QDECL R_SkyBox_Changed (struct cvar_s *var, char *oldvalue) { - R_SetSky(var->string); + R_SetSky(NULL); // Shader_NeedReload(false); }