X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_create_mutators.qc;h=f8bf895c2467b55c5ba80c4a84771aa271851826;hb=baeda00e5b0205e304ff26f3d618bffd31302b18;hp=07fe09c100e0bd4a09498dec63b9a6f1bdbdea38;hpb=4ee2807b2d8f808928ef14b3e814945b3edb4350;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
index 07fe09c10..f8bf895c2 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.qc
@@ -20,7 +20,7 @@ string weaponarenastring_cvar;
 string WeaponArenaString()
 {
 	string s;
-	float n, i;
+	float n;
 	s = cvar_string("g_weaponarena");
 	if(s == "0")
 		return "";
@@ -39,22 +39,20 @@ string WeaponArenaString()
 
 	n = tokenize_console(s);
 	s = "";
-	for(i = 0; i < n; ++i)
+	for(int j = 0; j < n; ++j)
 	{
-		FOREACH(Weapons, it != WEP_Null, LAMBDA(
-			if(argv(i) == it.netname)
-				s = strcat(s, " & ", it.m_name);
-		));
+		FOREACH(Weapons, it != WEP_Null, {
+			if(argv(j) == it.netname)
+				s = cons_mid(s, " & ", it.m_name);
+		});
 	}
-	s = sprintf(_("%s Arena"), substring(s, 3, strlen(s) - 3));
+	s = sprintf(_("%s Arena"), s);
 
 	weaponarenastring = strzone(s);
 
 	return weaponarenastring;
 }
 
-AUTOCVAR(g_grappling_hook, bool, _("let players spawn with the grappling hook which allows them to pull themselves up"));
-
 string XonoticMutatorsDialog_toString(entity me)
 {
 	string s;
@@ -73,13 +71,13 @@ string XonoticMutatorsDialog_toString(entity me)
 		s = strcat(s, ", ", _("Invincible Projectiles"));
 	if(cvar_string("g_weaponarena") != "0")
 		s = strcat(s, ", ", WeaponArenaString());
-	else if(cvar("g_balance_blaster_weaponstart") == 0)
+	else if(cvar("g_balance_blaster_weaponstartoverride") == 0)
 		s = strcat(s, ", ", _("No start weapons"));
 	if(cvar("sv_gravity") < stof(cvar_defstring("sv_gravity")))
 		s = strcat(s, ", ", _("Low gravity"));
 	if(cvar("g_cloaked"))
 		s = strcat(s, ", ", _("Cloaked"));
-	if(autocvar_g_grappling_hook)
+	if(cvar("g_grappling_hook"))
 		s = strcat(s, ", ", _("Hook"));
 	if(cvar("g_midair"))
 		s = strcat(s, ", ", _("Midair"));
@@ -93,7 +91,7 @@ string XonoticMutatorsDialog_toString(entity me)
 		s = strcat(s, ", ", _("Blood loss"));
 	if(cvar("g_jetpack"))
 		s = strcat(s, ", ", _("Jet pack"));
-	if(cvar("g_buffs"))
+	if(cvar("g_buffs") > 0)
 		s = strcat(s, ", ", _("Buffs"));
 	if(cvar("g_overkill"))
 		s = strcat(s, ", ", _("Overkill"));
@@ -145,7 +143,7 @@ float checkCompatibility_weaponarena_weapon(entity me)
 		return 0;
 	if(cvar_string("g_weaponarena") == "0")
 		return 0;
-	if(cvar_string("g_balance_blaster_weaponstart") == "0")
+	if(cvar_string("g_balance_blaster_weaponstartoverride") == "0")
 		return 0;
 	return 1;
 }
@@ -281,9 +279,9 @@ void XonoticMutatorsDialog_fill(entity me)
 			setDependent(e, "g_nix", 1, 1);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.8, e = makeXonoticRadioButton_T(1, "g_balance_blaster_weaponstart", "0", _("No start weapons"), "-"));
+		me.TD(me, 1, 1.8, e = makeXonoticRadioButton_T(1, "g_balance_blaster_weaponstartoverride", "0", _("No start weapons"), "-"));
 			e.cvarOffValue = "-1";
-			makeMulti(e, "g_balance_shotgun_weaponstart g_balance_machinegun_weaponstart g_balance_devastator_weaponstart g_balance_minelayer_weaponstart g_balance_electro_weaponstart g_balance_crylink_weaponstart g_balance_hagar_weaponstart g_balance_porto_weaponstart g_balance_vaporizer_weaponstart g_balance_hook_weaponstart g_balance_rifle_weaponstart g_balance_fireball_weaponstart g_balance_seeker_weaponstart g_balance_tuba_weaponstart g_balance_arc_weaponstart g_balance_vortex_weaponstart g_balance_mortar_weaponstart");
+			makeMulti(e, "g_balance_shotgun_weaponstartoverride g_balance_machinegun_weaponstartoverride g_balance_devastator_weaponstartoverride g_balance_minelayer_weaponstartoverride g_balance_electro_weaponstartoverride g_balance_crylink_weaponstartoverride g_balance_hagar_weaponstartoverride g_balance_porto_weaponstartoverride g_balance_vaporizer_weaponstartoverride g_balance_hook_weaponstartoverride g_balance_rifle_weaponstartoverride g_balance_fireball_weaponstartoverride g_balance_seeker_weaponstartoverride g_balance_tuba_weaponstartoverride g_balance_arc_weaponstartoverride g_balance_vortex_weaponstartoverride g_balance_mortar_weaponstartoverride");
 
 	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));