Merge branch 'master' into TimePath/deathtypes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / mutators / mutator_rocketminsta.qc

diff --git a/qcsrc/server/mutators/mutator_rocketminsta.qc b/qcsrc/server/mutators/mutator_rocketminsta.qc
index 4a4daa3c380ac523a7a1dbab07fc8816c037ffb3..b7319cf3e9e510f1d320360213623b0df29bc136 100644 (file)
--- a/qcsrc/server/mutators/mutator_rocketminsta.qc
+++ b/qcsrc/server/mutators/mutator_rocketminsta.qc
@@ -1,4 +1,4 @@
-#include "../../common/deathtypes.qh"
+#include "../../common/deathtypes/all.qh"
 #include "../round_handler.qh"
 
 REGISTER_MUTATOR(rm, cvar("g_instagib"));
@@ -8,12 +8,12 @@ MUTATOR_HOOKFUNCTION(rm, PlayerDamage_Calculate)
        // we do it this way, so rm can be toggled during the match
        if(!autocvar_g_rm) { return false; }
 
-       if(DEATH_ISWEAPON(frag_deathtype, WEP_DEVASTATOR.m_id))
+       if(DEATH_ISWEAPON(frag_deathtype, WEP_DEVASTATOR))
        if(frag_attacker == frag_target || frag_target.classname == "nade")
                frag_damage = 0;
 
        if(autocvar_g_rm_laser)
-       if(DEATH_ISWEAPON(frag_deathtype, WEP_ELECTRO.m_id))
+       if(DEATH_ISWEAPON(frag_deathtype, WEP_ELECTRO))
        if(frag_attacker == frag_target || (round_handler_IsActive() && !round_handler_IsRoundStarted()))
                frag_damage = 0;
 
@@ -25,7 +25,7 @@ MUTATOR_HOOKFUNCTION(rm, PlayerDies)
        // we do it this way, so rm can be toggled during the match
        if(!autocvar_g_rm) { return false; }
 
-       if(DEATH_ISWEAPON(frag_deathtype, WEP_DEVASTATOR.m_id) || DEATH_ISWEAPON(frag_deathtype, WEP_ELECTRO.m_id))
+       if(DEATH_ISWEAPON(frag_deathtype, WEP_DEVASTATOR) || DEATH_ISWEAPON(frag_deathtype, WEP_ELECTRO))
                frag_damage = 1000; // always gib if it was a vaporizer death
 
        return false;