From: bones_was_here <bones_was_here@yahoo.com.au>
Date: Sun, 14 Jun 2020 08:38:07 +0000 (+1000)
Subject: Allow mappers to set r_water and server admins to add mapinfo ACLs
X-Git-Tag: xonotic-v0.8.5~893^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6551e487a054a2507c0bb48c2efc3e73713e1e9a;p=xonotic%2Fxonotic-data.pk3dir.git

Allow mappers to set r_water and server admins to add mapinfo ACLs
---

diff --git a/qcsrc/common/mapinfo.qh b/qcsrc/common/mapinfo.qh
index 4d598e88c..9b4dfa257 100644
--- a/qcsrc/common/mapinfo.qh
+++ b/qcsrc/common/mapinfo.qh
@@ -680,4 +680,4 @@ void MapInfo_ClearTemps(); // call this when done with mapinfo for this frame
 void MapInfo_Shutdown(); // call this in the shutdown handler
 
 #define MAPINFO_SETTEMP_ACL_USER cvar_string("g_mapinfo_settemp_acl")
-#define MAPINFO_SETTEMP_ACL_SYSTEM "-g_mapinfo_* -rcon_* -_* -g_ban* -r_water +*"
+#define MAPINFO_SETTEMP_ACL_SYSTEM "-g_mapinfo_* -rcon_* -_* -g_ban* +*"
diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 0e9f7fa66..26cead4cc 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -294,6 +294,7 @@ void cvar_changes_init()
 		BADCVAR("nextmap");
 		BADCVAR("teamplay");
 		BADCVAR("timelimit");
+		BADCVAR("g_mapinfo_settemp_acl");
 		BADCVAR("g_mapinfo_ignore_warnings");
 		BADCVAR("g_maplist_ignore_sizes");
 		BADCVAR("g_maplist_sizes_count_bots");