From: Martin Taibr <taibr.martin@gmail.com>
Date: Wed, 20 Feb 2019 19:55:19 +0000 (+0100)
Subject: remove friendly fire from damagetext menu
X-Git-Tag: xonotic-v0.8.5~1475^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4fcffef8aae63ae984f514f3b189ec61b8a99713;p=xonotic%2Fxonotic-data.pk3dir.git

remove friendly fire from damagetext menu
---

diff --git a/qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc
index 4f7f045d8..e85228e33 100644
--- a/qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc
+++ b/qcsrc/common/mutators/mutator/damagetext/ui_damagetext.qc
@@ -32,15 +32,5 @@ CLASS(XonoticDamageTextSettings, XonoticTab)
             this.TD(this, 2, 2, e = makeXonoticColorpickerString("cl_damagetext_color", "cl_damagetext_color"));
                 setDependent(e, "cl_damagetext", 1, 1);
         this.TR(this);
-        this.TR(this);
-        // friendly fire
-            this.TD(this, 1, 3, e = makeXonoticCheckBox(0, "cl_damagetext_friendlyfire", _("Draw damage numbers for friendly fire")));
-                setDependent(e, "cl_damagetext", 1, 1);
-        this.TR(this);
-            this.TD(this, 1, 1, e = makeXonoticTextLabel(0, _("Color:")));
-                setDependentAND(e, "cl_damagetext", 1, 1, "cl_damagetext_friendlyfire", 1, 1);
-            this.TD(this, 2, 2, e = makeXonoticColorpickerString("cl_damagetext_friendlyfire_color", "cl_damagetext_friendlyfire_color"));
-                setDependentAND(e, "cl_damagetext", 1, 1, "cl_damagetext_friendlyfire", 1, 1);
-        this.TR(this);
     }
 ENDCLASS(XonoticDamageTextSettings)