]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Properly check for InstaGib k9er/show-vaporizer-dmgtxt 1397/head
authorotta8634 <k9wolf@pm.me>
Sun, 22 Dec 2024 05:24:19 +0000 (13:24 +0800)
committerotta8634 <k9wolf@pm.me>
Sun, 22 Dec 2024 05:26:17 +0000 (13:26 +0800)
Also remove include

qcsrc/common/mutators/mutator/damagetext/sv_damagetext.qc

index 11f10345baa7f7193871d0fc06c3aee90f6e87fe..6d552163da6eb627a3ed61b7213f3efbb43455c2 100644 (file)
@@ -1,7 +1,5 @@
 #include "sv_damagetext.qh"
 
-#include <common/mutators/mutator/instagib/sv_instagib.qh>
-
 AUTOCVAR(sv_damagetext, int, 2, "<= 0: disabled, >= 1: visible to spectators, >= 2: visible to attacker, >= 3: all players see everyone's damage");
 
 REGISTER_MUTATOR(damagetext, true);
@@ -69,7 +67,7 @@ MUTATOR_HOOKFUNCTION(damagetext, PlayerDamaged) {
        float armor = M_ARGV(3, float);
        int deathtype = M_ARGV(5, int);
        float potential_damage = M_ARGV(6, float);
-       if(autocvar_g_instagib && DEATH_WEAPONOF(deathtype) == WEP_VAPORIZER) return;
+       if(MUTATOR_IS_ENABLED(mutator_instagib) && DEATH_WEAPONOF(deathtype) == WEP_VAPORIZER) return;
 
        static entity net_text_prev;
        static float net_damagetext_prev_time;