]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Send ent_DamageInfo for hitscan damage too. Why wasn't this done in the first place...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 4 Jan 2012 00:52:03 +0000 (02:52 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Wed, 4 Jan 2012 00:52:03 +0000 (02:52 +0200)
qcsrc/client/damage.qc
qcsrc/server/g_damage.qc

index 4828a5b43ec948f61291d81d15fda3c8acc2db69..662c8fddb9ee7076a2609eb905aa6cfcf01bd458 100644 (file)
@@ -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;
        
index 16bde33c2b865aeec7e14cbd0240576d30bdd103..eccf7a4a856e8f952a28170ac03c0d365f05c140 100644 (file)
@@ -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")