X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Futil.qc;h=cf4139fdeea9c51582fecfdd7d710fb9782b2abb;hb=e6eb6e7fc36a3a243c5171b8cc3db88e823514d4;hp=222b862ea558c6373d00721a148290c2b9c33f81;hpb=c07a907b93f175325805959e59b844d1c37b80f4;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 222b862ea..cf4139fde 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -92,6 +92,8 @@ void saveCvarsMulti(entity me)
 			cvar_set(substring(argv(i), 1, strlen(argv(i))), ((s == "0") ? "1" : "0"));
 		else
 			cvar_set(argv(i), s);
+
+		CheckSendCvars(me, argv(i));
 	}
 }
 void makeMulti(entity e, string otherCvars)
@@ -305,17 +307,17 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data)
 	}
 	if(status != 0)
 	{
-		printf(_("error receiving update notification: status is %d\n"), status);
+		dprintf("error receiving update notification: status is %d\n", status);
 		return;
 	}
 	if(substring(data, 0, 1) == "<")
 	{
-		print(_("error: received HTML instead of an update notification\n"));
+		dprint("error: received HTML instead of an update notification\n");
 		return;
 	}
 	if(strstrofs(data, "\r", 0) != -1)
 	{
-		print(_("error: received carriage returns from update notification server\n"));
+		dprint("error: received carriage returns from update notification server\n");
 		return;
 	}
 
@@ -343,7 +345,6 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data)
 		
 		switch(substring(argv(i), 0, 1))
 		{
-			#define APPEND_TO_STRING(list,sep,add) ((list) = (((list) != "") ? strcat(list, sep, add) : (add)))
 			case "V":
 			{
 				un_version = s;
@@ -656,7 +657,7 @@ float updateCompression()
 	GAMETYPE(MAPINFO_TYPE_LMS) \
 	GAMETYPE(MAPINFO_TYPE_NEXBALL) \
 	GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \
-	GAMETYPE(MAPINFO_TYPE_RACE) \
+	if (cvar("developer")) GAMETYPE(MAPINFO_TYPE_RACE) \
 	GAMETYPE(MAPINFO_TYPE_CTS) \
 	GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH) \
 	//GAMETYPE(MAPINFO_TYPE_INVASION) \
@@ -667,7 +668,7 @@ float GameType_GetID(float cnt)
 	float i;
 	i = 0;
 
-	#define GAMETYPE(id) if(i++ == cnt) return id;
+	#define GAMETYPE(id) { if(i++ == cnt) return id; }
 	GAMETYPES
 	#undef GAMETYPE
 
@@ -766,3 +767,15 @@ void dialog_hudpanel_common_notoggle(entity me, string panelname)
 					e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
 				e.configureXonoticTextSliderValues(e);
 }
+
+void CheckSendCvars(entity me, string cvarnamestring)
+{
+	if(me.sendCvars)
+	{
+		printf("Sending cvar: %s -> %s\n", cvarnamestring, cvar_string(cvarnamestring));
+		if(gamestatus & (GAME_CONNECTED | GAME_ISSERVER))
+		{
+			cmd(sprintf("\nsendcvar %s\n", cvarnamestring));
+		}
+	}
+}