X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmutators%2Fmutator_rocketminsta.qc;h=b7319cf3e9e510f1d320360213623b0df29bc136;hb=437d67dbc7631d6c49e922990d96461d3ff4b7b2;hp=07148cc58d02fa455c39c97210e248108ad9ce31;hpb=86c9dc7c3696c329496b06375c1e79fb407401ce;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/mutators/mutator_rocketminsta.qc b/qcsrc/server/mutators/mutator_rocketminsta.qc
index 07148cc58..b7319cf3e 100644
--- a/qcsrc/server/mutators/mutator_rocketminsta.qc
+++ b/qcsrc/server/mutators/mutator_rocketminsta.qc
@@ -1,3 +1,6 @@
+#include "../../common/deathtypes/all.qh"
+#include "../round_handler.qh"
+
 REGISTER_MUTATOR(rm, cvar("g_instagib"));
 
 MUTATOR_HOOKFUNCTION(rm, PlayerDamage_Calculate)
@@ -5,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;
 
@@ -22,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;