X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Futil.qc;h=a0018b99a905f7af574d043c37f8de75711c3021;hp=157a9199cbe2dcfed876764332dbdb699020ceb4;hb=c6ebaefab2aca7df4648dac3ccdd4b52de45d0ed;hpb=b9b32643554806fb5f901f9bd48ecfcc43fd98b8

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 157a9199c..a0018b99a 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -1,17 +1,17 @@
 #include "util.qh"
 
-#include "../item.qc"
+#include "../item.qh"
 
 #include "../menu.qh"
-#include "../../common/campaign_common.qh"
-#include "../../common/constants.qh"
-#include "../../common/mapinfo.qh"
-#include "../../common/util.qh"
-#include "../../common/command/generic.qh"
+#include <common/campaign_common.qh>
+#include <common/constants.qh>
+#include <common/mapinfo.qh>
+#include <common/util.qh>
+#include <common/command/generic.qh>
 
 float GL_CheckExtension(string ext)
 {
-	return (strstrofs(strcat(" ", cvar_string("gl_info_extensions"), " "), strcat(" ", ext, " "), 0) >= 0);
+	return strhasword(cvar_string("gl_info_extensions"), ext);
 }
 
 float GL_Have_TextureCompression()
@@ -63,7 +63,7 @@ string getCvarsMulti(entity me)
 void saveCvarsMulti(entity me)
 {
 	float n, i;
-	string s;
+	string s, cvarname;
 
 	me.saveCvars_Multi(me);
 	s = cvar_string(me.cvarName);
@@ -71,12 +71,19 @@ void saveCvarsMulti(entity me)
 	n = tokenize_console(me.cvarNames_Multi);
 	for(i = 0; i < n; ++i)
 	{
+		// cvars prefixed with ! get saved with the inverted value
 		if(substring(argv(i), 0, 1) == "!")
-			cvar_set(substring(argv(i), 1, strlen(argv(i))), ((s == "0") ? "1" : "0"));
+		{
+			cvarname = substring(argv(i), 1, strlen(argv(i)));
+			cvar_set(cvarname, ((s == "0") ? "1" : "0"));
+		}
 		else
-			cvar_set(argv(i), s);
+		{
+			cvarname = argv(i);
+			cvar_set(cvarname, s);
+		}
 
-		CheckSendCvars(me, argv(i));
+		CheckSendCvars(me, cvarname);
 	}
 }
 void makeMulti(entity e, string otherCvars)
@@ -277,6 +284,7 @@ string _Nex_ExtResponseSystem_UpdateToURL;
 string _Nex_ExtResponseSystem_Packs;
 float _Nex_ExtResponseSystem_PacksStep;
 
+/** engine callback */
 void URI_Get_Callback(float id, float status, string data)
 {
 	if(url_URI_Get_Callback(id, status, data))
@@ -421,6 +429,12 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data)
 		}
 	}
 
+	if(un_bannedservers != "")
+	{
+		_Nex_ExtResponseSystem_BannedServers = strzone(un_bannedservers);
+		_Nex_ExtResponseSystem_BannedServersNeedsRefresh = 1;
+	}
+
 	if(un_emergency_pk3s != "")
 	{
 		_Nex_ExtResponseSystem_Packs = strzone(un_emergency_pk3s);
@@ -672,7 +686,7 @@ float updateCompression()
 	GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \
 	GAMETYPE(MAPINFO_TYPE_ASSAULT) \
 	if (cvar("developer")) GAMETYPE(MAPINFO_TYPE_RACE) \
-	GAMETYPE(MAPINFO_TYPE_CTS) \
+	if (cvar("developer")) GAMETYPE(MAPINFO_TYPE_CTS) \
 	/* GAMETYPE(MAPINFO_TYPE_INVASION) */ \
 	/**/