From e169123eddb2141b43e305390cbe3d528c46d695 Mon Sep 17 00:00:00 2001 From: Mario Date: Fri, 6 Jan 2017 03:57:18 +1000 Subject: [PATCH] Add the weapon entity to the firebullet mutator hook --- qcsrc/server/mutators/events.qh | 1 + qcsrc/server/weapons/tracing.qc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/qcsrc/server/mutators/events.qh b/qcsrc/server/mutators/events.qh index 7bce389c3a..ebe03df12d 100644 --- a/qcsrc/server/mutators/events.qh +++ b/qcsrc/server/mutators/events.qh @@ -664,6 +664,7 @@ MUTATOR_HOOKABLE(GetModelParams, EV_GetModelParams); /** end pos */ i(vector, MUTATOR_ARGV_3_vector) \ /** damage */ i(float, MUTATOR_ARGV_4_float) \ /**/ o(float, MUTATOR_ARGV_4_float) \ + /** wep entity */ i(entity, MUTATOR_ARGV_5_entity) \ /**/ MUTATOR_HOOKABLE(FireBullet_Hit, EV_FireBullet_Hit); diff --git a/qcsrc/server/weapons/tracing.qc b/qcsrc/server/weapons/tracing.qc index 66a76fcf97..3c4eb44a0d 100644 --- a/qcsrc/server/weapons/tracing.qc +++ b/qcsrc/server/weapons/tracing.qc @@ -436,7 +436,7 @@ void fireBullet(entity this, .entity weaponentity, vector start, vector dir, flo { fireBullet_last_hit = hit; yoda = 0; - MUTATOR_CALLHOOK(FireBullet_Hit, this, hit, start, end, damage); + MUTATOR_CALLHOOK(FireBullet_Hit, this, hit, start, end, damage, this.(weaponentity)); damage = M_ARGV(4, float); float g = accuracy_isgooddamage(this, hit); Damage(hit, this, this, damage * solid_penetration_left, dtype, start, force * dir * solid_penetration_left); -- 2.39.2