From: Mario <mario@smbclan.net>
Date: Thu, 3 May 2018 11:28:33 +0000 (+1000)
Subject: Give mutators access to the attacker's weapon entity from the Damage_Calculate mutato... 
X-Git-Tag: xonotic-v0.8.5~2149
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7d14a953f80ab0675b57247f1723a26fa0e31060;p=xonotic%2Fxonotic-data.pk3dir.git

Give mutators access to the attacker's weapon entity from the Damage_Calculate mutator hook
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index b36cfc95a..f87bce9e8 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -713,7 +713,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, int d
 		}
 
 		// should this be changed at all? If so, in what way?
-		MUTATOR_CALLHOOK(Damage_Calculate, inflictor, attacker, targ, deathtype, damage, mirrordamage, force);
+		MUTATOR_CALLHOOK(Damage_Calculate, inflictor, attacker, targ, deathtype, damage, mirrordamage, force, attacker.(weaponentity));
 		damage = M_ARGV(4, float);
 		mirrordamage = M_ARGV(5, float);
 		force = M_ARGV(6, vector);
diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh
index 240f8fc25..d1ba087a2 100644
--- a/qcsrc/server/mutators/events.qh
+++ b/qcsrc/server/mutators/events.qh
@@ -411,7 +411,8 @@ MUTATOR_HOOKABLE(PlayerDamage_SplitHealthArmor, EV_PlayerDamage_SplitHealthArmor
     /** mirrordamage    */ i(float,  MUTATOR_ARGV_5_float) \
     /** mirrordamage 	*/ o(float,  MUTATOR_ARGV_5_float) \
     /** force           */ i(vector, MUTATOR_ARGV_6_vector) \
-    /** force 			*/ o(vector, MUTATOR_ARGV_6_vector) \
+    /** force           */ o(vector, MUTATOR_ARGV_6_vector) \
+    /** weapon entity 	*/ i(entity, MUTATOR_ARGV_7_entity) \
     /**/
 MUTATOR_HOOKABLE(Damage_Calculate, EV_Damage_Calculate);