From: Martin Taibr <taibr.martin@gmail.com>
Date: Tue, 8 Aug 2017 17:39:22 +0000 (+0200)
Subject: disable damagetext in instagib
X-Git-Tag: xonotic-v0.8.5~2510^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8a0cb1dc6aaadf6ab8f771b94f968fba8ccb9009;p=xonotic%2Fxonotic-data.pk3dir.git

disable damagetext in instagib
---

diff --git a/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc
index 0e170e57e..7e9608642 100644
--- a/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc
+++ b/qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc
@@ -9,7 +9,7 @@ REGISTER_MUTATOR(damagetext, true);
 #define SV_DAMAGETEXT_PLAYERS()         (autocvar_sv_damagetext >= 2 /* players */)
 #define SV_DAMAGETEXT_ALL()             (autocvar_sv_damagetext >= 3 /* all players */)
 MUTATOR_HOOKFUNCTION(damagetext, PlayerDamaged) {
-    if (SV_DAMAGETEXT_DISABLED()) return;
+    if (SV_DAMAGETEXT_DISABLED() || autocvar_g_instagib) return;
     const entity attacker = M_ARGV(0, entity);
     const entity hit = M_ARGV(1, entity); if (hit == attacker) return;
     const float health = M_ARGV(2, float);