X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_create_mutators.c;h=3bac353053bc9a69e5213a3190efa4acbbf05046;hb=26f37b6d480a3a276af0ab52ac340dd110186704;hp=40fb4cca5e8786ef45a64e6a3cbe6b80c723598c;hpb=026dde2924af9bca060bc1bea3e194c47e98b4be;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
index 40fb4cca5..3bac35305 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
@@ -29,7 +29,7 @@ string WeaponArenaString()
 	s = cvar_string("g_weaponarena");
 	if(s == "0")
 		return "";
-	if(s == "all")
+	if(s == "all" || s == "1")
 		return _("All Weapons Arena");
 	if(s == "most")
 		return _("Most Weapons Arena");
@@ -66,8 +66,8 @@ string XonoticMutatorsDialog_toString(entity me)
 	s = "";
 	if(cvar("g_dodging"))
 		s = strcat(s, ", ", _("Dodging"));
-	if(cvar("g_minstagib"))
-		s = strcat(s, ", ", _("MinstaGib"));
+	if(cvar("g_instagib"))
+		s = strcat(s, ", ", _("InstaGib"));
 	if(cvar("g_new_toys"))
 		s = strcat(s, ", ", _("New Toys"));
 	if(cvar("g_nix"))
@@ -80,7 +80,7 @@ string XonoticMutatorsDialog_toString(entity me)
 		s = strcat(s, ", ", WeaponArenaString());
 	if(cvar("g_start_weapon_laser") == 0)
 		s = strcat(s, ", ", _("No start weapons"));
-	if(cvar("sv_gravity") < 800)
+	if(cvar("sv_gravity") < stof(cvar_defstring("sv_gravity")))
 		s = strcat(s, ", ", _("Low gravity"));
 	if(cvar("g_cloaked"))
 		s = strcat(s, ", ", _("Cloaked"));
@@ -112,7 +112,7 @@ string XonoticMutatorsDialog_toString(entity me)
 
 float checkCompatibility_pinata(entity me)
 {
-	if(cvar("g_minstagib"))
+	if(cvar("g_instagib"))
 		return 0;
 	if(cvar("g_nix"))
 		return 0;
@@ -126,11 +126,11 @@ float checkCompatibility_weaponstay(entity me)
 }
 float checkCompatibility_newtoys(entity me)
 {
-	if(cvar("g_minstagib"))
+	if(cvar("g_instagib"))
 		return 0;
 	if(cvar_string("g_weaponarena") == "most")
 		return 1;
-	if(cvar_string("g_weaponarena") == "all")
+	if(cvar_string("g_weaponarena") == "all" || cvar_string("g_weaponarena") == "1")
 		return 1;
 	if(cvar_string("g_weaponarena") != "0")
 		return 0;
@@ -138,11 +138,11 @@ float checkCompatibility_newtoys(entity me)
 }
 float checkCompatibility_weaponarena_weapon(entity me)
 {
-	if(cvar("g_minstagib"))
+	if(cvar("g_instagib"))
 		return 0;
 	if(cvar_string("g_weaponarena") == "most")
 		return 0;
-	if(cvar_string("g_weaponarena") == "all")
+	if(cvar_string("g_weaponarena") == "all" || cvar_string("g_weaponarena") == "1")
 		return 0;
 	if(cvar_string("g_weaponarena") == "0")
 		return 0;
@@ -172,11 +172,12 @@ void XonoticMutatorsDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_vampire", _("Vampire")));
+			setDependent(e, "g_instagib", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		s = makeXonoticSlider(10, 50, 1, "g_bloodloss");
 		me.TD(me, 1, 1.8, e = makeXonoticSliderCheckBox(0, 1, s, _("Blood loss")));
-			setDependent(e, "g_minstagib", 0, 0);
+			setDependent(e, "g_instagib", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.4);
 		me.TD(me, 1, 1.6, s);
@@ -201,6 +202,7 @@ void XonoticMutatorsDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_invincible_projectiles", _("Invincible Projectiles")));
+			setDependent(e, "g_instagib", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_new_toys", _("New Toys")));
@@ -208,6 +210,7 @@ void XonoticMutatorsDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_rocket_flying", _("Rocket Flying")));
+			setDependent(e, "g_instagib", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "g_pinata", _("Piñata")));
@@ -229,7 +232,7 @@ void XonoticMutatorsDialog_fill(entity me)
 		w = get_weaponinfo(i);
 		if(w.spawnflags & WEP_FLAG_HIDDEN)
 			continue;
-		if(j & 1 == 0)
+		if((j & 1) == 0)
 			me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.8, e = makeXonoticWeaponarenaCheckBox(strzone(w.netname), strzone(w.message)));
@@ -248,7 +251,7 @@ void XonoticMutatorsDialog_fill(entity me)
 		me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Special arenas:")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_minstagib", "1", _("MinstaGib")));
+		me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "g_instagib", "1", _("InstaGib")));
 			e.cvarOffValue = "0";
 	me.TR(me);
 		me.TDempty(me, 0.2);