From: Mario Date: Mon, 6 Mar 2017 21:11:30 +0000 (+1000) Subject: Don't set HITTYPE_BOUNCE on the napalm fire damage (not used, may be cause of deathty... X-Git-Tag: xonotic-v0.8.2~121 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=772656f57b57e7e73311de78a39f5227f3c7e0f1;p=xonotic%2Fxonotic-data.pk3dir.git Don't set HITTYPE_BOUNCE on the napalm fire damage (not used, may be cause of deathtype warnings) --- diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc index 45e6d997e..d268b169d 100644 --- a/qcsrc/common/mutators/mutator/nades/nades.qc +++ b/qcsrc/common/mutators/mutator/nades/nades.qc @@ -220,7 +220,7 @@ void napalm_damage(entity this, float dist, float damage, float edgedamage, floa { d = vlen(WarpZone_UnTransformOrigin(RandomSelection_chosen_ent, this.origin) - RandomSelection_chosen_ent.fireball_impactvec); d = damage + (edgedamage - damage) * (d / dist); - Fire_AddDamage(RandomSelection_chosen_ent, this.realowner, d * burntime, burntime, this.projectiledeathtype | HITTYPE_BOUNCE); + Fire_AddDamage(RandomSelection_chosen_ent, this.realowner, d * burntime, burntime, this.projectiledeathtype); //trailparticles(this, particleeffectnum(EFFECT_FIREBALL_LASER), this.origin, RandomSelection_chosen_ent.fireball_impactvec); Send_Effect(EFFECT_FIREBALL_LASER, this.origin, RandomSelection_chosen_ent.fireball_impactvec - this.origin, 1); }