Merge branch 'master' into terencehill/itemstime

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_multiplayer_create_mutators.c

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
index 328e3d79e0ed8556a8f16e583b993c427464f84f..2d642728e6be854dcdce36c9aa29ec83a077b1a3 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_create_mutators.c
@@ -68,6 +68,8 @@ string XonoticMutatorsDialog_toString(entity me)
                s = strcat(s, ", ", _("Dodging"));
        if(cvar("g_minstagib"))
                s = strcat(s, ", ", _("MinstaGib"));
+       if(cvar("g_new_toys"))
+               s = strcat(s, ", ", _("New Toys"));
        if(cvar("g_nix"))
                s = strcat(s, ", ", _("NIX"));
        if(cvar("g_rocket_flying"))
@@ -161,7 +163,6 @@ void preDrawLaserWeaponArenaLaserButton(entity me)
 
 float checkCompatibility_pinata(entity me)
 {
-       string s;
        if(cvar("g_minstagib"))
                return 0;
        if(cvar("g_nix"))
@@ -174,6 +175,18 @@ float checkCompatibility_weaponstay(entity me)
 {
        return checkCompatibility_pinata(me);
 }
+float checkCompatibility_newtoys(entity me)
+{
+       if(cvar("g_minstagib"))
+               return 0;
+       if(cvar_string("g_weaponarena") == "most")
+               return 1;
+       if(cvar_string("g_weaponarena") == "all")
+               return 1;
+       if(cvar_string("g_weaponarena") != "0")
+               return 0;
+       return 1;
+}
 
 void XonoticMutatorsDialog_fill(entity me)
 {
@@ -223,6 +236,10 @@ void XonoticMutatorsDialog_fill(entity me)
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_invincible_projectiles", _("Invincible Projectiles")));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_new_toys", _("New Toys")));
+                       setDependentWeird(e, checkCompatibility_newtoys);
        me.TR(me);
                me.TDempty(me, 0.2);
                me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "g_rocket_flying", _("Rocket Flying")));