From: Mircea Kitsune Date: Wed, 4 Jan 2012 00:52:03 +0000 (+0200) Subject: Send ent_DamageInfo for hitscan damage too. Why wasn't this done in the first place... X-Git-Tag: xonotic-v0.6.0~110^2^2~85 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=74506d6244b1a6e2a02e7f44e5732085826954a9;p=xonotic%2Fxonotic-data.pk3dir.git Send ent_DamageInfo for hitscan damage too. Why wasn't this done in the first place? This change might need some checking to make sure it's ok. --- diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc index 4828a5b43..662c8fddb 100644 --- a/qcsrc/client/damage.qc +++ b/qcsrc/client/damage.qc @@ -68,9 +68,8 @@ void Ent_DamageInfo(float isNew) if(self.event_damage) self.event_damage(thisdmg, w_deathtype, w_org, thisforce); - - DamageEffect(dmg, w_deathtype, species, self.entnum); } + DamageEffect(dmg, w_deathtype, species, self.entnum); self = oldself; diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc index 16bde33c2..eccf7a4a8 100644 --- a/qcsrc/server/g_damage.qc +++ b/qcsrc/server/g_damage.qc @@ -580,6 +580,8 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float } else { + Damage_DamageInfo(hitloc, damage, 0, 0, force, deathtype, attacker); + /* skill based bot damage? gtfo. (tZork) if (targ.classname == "player")