]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
disable damagetext in instagib
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 8 Aug 2017 17:39:22 +0000 (19:39 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 8 Aug 2017 17:39:22 +0000 (19:39 +0200)
qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc

index 0e170e57ec6249fd4e3ed9e82a284145f691a078..7e96086426fa5a46ad1069d42f5e6bc3e2484fc1 100644 (file)
@@ -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);