From: Dr. Jaska <drjaska83@gmail.com>
Date: Tue, 9 May 2023 09:04:05 +0000 (+0000)
Subject: whitelist g_*_weaponarena "most" and "most_available"
X-Git-Tag: xonotic-v0.8.6~116^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a3065896449902ecb164798677b4243c111dbf62;p=xonotic%2Fxonotic-data.pk3dir.git

whitelist g_*_weaponarena "most" and "most_available"
---

diff --git a/qcsrc/server/world.qc b/qcsrc/server/world.qc
index cdc7d3169..c80317d6e 100644
--- a/qcsrc/server/world.qc
+++ b/qcsrc/server/world.qc
@@ -170,6 +170,7 @@ void cvar_changes_init()
 #define BADPRESUFFIX(p,s) if(substring(k, 0, strlen(p)) == p && substring(k, -strlen(s), -1) == s) continue
 #define BADCVAR(p) if(k == p) continue
 #define BADVALUE(p, val) if (k == p && v == val) continue
+#define BADPRESUFFIXVALUE(p,s,val) if(substring(k, 0, strlen(p)) == p && substring(k, -strlen(s), -1) == s && v == val) continue
 
 		// general excludes and namespaces for server admin used cvars
 		BADPREFIX("help_"); // PN's server has this listed as changed, let's not rat him out for THAT
@@ -512,6 +513,9 @@ void cvar_changes_init()
 		BADPREFIX("sv_info_");
 		BADPREFIX("sv_ready_restart_");
 
+		BADPRESUFFIXVALUE("g_", "_weaponarena", "most");
+		BADPRESUFFIXVALUE("g_", "_weaponarena", "most_available");
+
 		// mutators that announce themselves properly to the server browser
 		BADCVAR("g_instagib");
 		BADCVAR("g_new_toys");
@@ -523,6 +527,7 @@ void cvar_changes_init()
 #undef BADPREFIX
 #undef BADCVAR
 #undef BADVALUE
+#undef BADPRESUFFIXVALUE
 
 		if(pureadding)
 		{