From c7d30acd1dc4ecbeb0126c3354b6edf983f50dca Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 11 Jun 2013 17:57:02 +1000 Subject: [PATCH] Add damageinfo for nades --- qcsrc/server/mutators/mutator_nades.qc | 6 ++---- qcsrc/server/mutators/mutator_nades.qh | 6 +++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc index b81451cd0..3f90b46f5 100644 --- a/qcsrc/server/mutators/mutator_nades.qc +++ b/qcsrc/server/mutators/mutator_nades.qc @@ -1,7 +1,3 @@ -.entity nade; -.entity fake_nade; -.float nade_refire; - void nade_timer_think() { self.skin = 8 - (self.owner.wait - time) / (autocvar_g_nades_nade_lifetime / 10); @@ -71,6 +67,8 @@ void nade_boom() // TODO: DamageInfo sound(self, CH_SHOTS_SINGLE, "misc/null.wav", VOL_BASE, ATTN_NORM); sound(self, CH_SHOTS, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM); pointparticles(particleeffectnum(expef), self.origin + '0 0 1', '0 0 0', 1); + + Damage_DamageInfo(self.origin, autocvar_g_nades_nade_damage, autocvar_g_nades_nade_edgedamage, autocvar_g_nades_nade_radius, '1 1 1' * autocvar_g_nades_nade_force, self.projectiledeathtype, 0, self); self.takedamage = DAMAGE_NO; RadiusDamage(self, self.realowner, autocvar_g_nades_nade_damage, autocvar_g_nades_nade_edgedamage, diff --git a/qcsrc/server/mutators/mutator_nades.qh b/qcsrc/server/mutators/mutator_nades.qh index 9591b811e..1940f4e05 100644 --- a/qcsrc/server/mutators/mutator_nades.qh +++ b/qcsrc/server/mutators/mutator_nades.qh @@ -1 +1,5 @@ -void() nades_CheckThrow; \ No newline at end of file +.entity nade; +.entity fake_nade; +.float nade_refire; + +void() nades_CheckThrow; -- 2.39.2