X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Futil.qc;h=3473bb38c3103558d4e317c37e4f6e0c48aa9dfa;hb=5e3a7beca384caa6f3da36fe07b29aff942e7b3e;hp=d98368074a717cfc5b5d627fae9d7372aaecf7b6;hpb=d83e03a366494037c020f4cebf474325de88e69e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index d98368074..3473bb38c 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)
@@ -656,9 +658,10 @@ 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) \
 	/* nothing */
 
 float GameType_GetID(float cnt)
@@ -666,7 +669,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
 
@@ -707,22 +710,6 @@ string GameType_GetIcon(float cnt)
 	return "";
 }
 
-/*string GameType_GetTeams(float cnt) // poor implementation, later something else could be done that's better?
-{
-	float i = GameType_GetID(cnt);
-	string s = _MapInfo_GetDefaultEx(i);
-
-	if(i)
-	{
-		if(strstrofs(s, "teams", 0) >= 0)
-			return _("teamplay");
-		else
-			return _("free for all");
-	}
-
-	return _("tuba for all");
-}*/
-
 void dialog_hudpanel_common_notoggle(entity me, string panelname)
 {
 	float i;
@@ -781,3 +768,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));
+		}
+	}
+}