From 96a748f189237ce619aeb3d8bba67cb6aa456352 Mon Sep 17 00:00:00 2001 From: Marco Hladik Date: Thu, 22 Apr 2021 12:14:56 +0200 Subject: [PATCH] Server: Flush 'skyname' serverinfo before setting the .bsp one, to prevent it from bleeding to maps that don't define 'skyname' from old configs. --- src/client/sky.qc | 2 +- src/server/entry.qc | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/client/sky.qc b/src/client/sky.qc index 3b78368b..d9c6ec03 100644 --- a/src/client/sky.qc +++ b/src/client/sky.qc @@ -21,6 +21,6 @@ Sky_Update(int force) { if (g_strSkyName != serverkey("skyname") || force == TRUE) { g_strSkyName = serverkey("skyname"); - localcmd(sprintf("sky %s\n", g_strSkyName)); + localcmd(sprintf("sky \"%s\"\n", g_strSkyName)); } } diff --git a/src/server/entry.qc b/src/server/entry.qc index df1542ea..d56941ec 100644 --- a/src/server/entry.qc +++ b/src/server/entry.qc @@ -533,6 +533,10 @@ worldspawn(void) if (autocvar_sv_levelexec) readcmd(sprintf("exec maps/%s.cfg\n", mapname)); + /* we need to flush this, so that any leftover serverinfo + * in the server-config gets overwritten */ + forceinfokey(world, "skyname", ""); + /* Set the default sky */ if (serverkeyfloat("*bspversion") == BSPVER_HL) { if (!self.skyname) {