Merge remote-tracking branch 'origin/mirceakitsune/bugfix_impact_effects'

diff --combined qcsrc/client/damage.qc
index 49d392abea2862397e6c49cbdb91ba62dab75c2e,7785ebcbf82b597f06f5e1576b4a84127da7fdfd..fc8b83b5b6c8666a11efe0961ebe8af011cfcbfb
--- 1/qcsrc/client/damage.qc
--- 2/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@@ -113,7 -113,7 +113,7 @@@ void DamageEffect(vector hitorg, float 
  
  void Ent_DamageInfo(float isNew)
  {
-       float dmg, rad, edge, thisdmg, forcemul, species;
+       float dmg, rad, edge, thisdmg, forcemul, species, hitplayer;
        vector force, thisforce;
        entity oldself;
  
@@@ -146,10 -146,6 +146,10 @@@
        
        for(self = findradius(w_org, rad + MAX_DAMAGEEXTRARADIUS); self; self = self.chain)
        {
 +              // attached ents suck
 +              if(self.tag_entity)
 +                      continue;
 +
                vector nearest = NearestPointOnBox(self, w_org);
                if(rad)
                {
@@@ -192,6 -188,9 +192,9 @@@
                        self.event_damage(thisdmg, w_deathtype, w_org, thisforce);
  
                DamageEffect(w_org, thisdmg, w_deathtype, species);
+ 
+               if(self.isplayermodel)
+                       hitplayer = TRUE; // this impact damaged a player
        }
  
        self = oldself;
@@@ -329,6 -328,7 +332,7 @@@
        
        // TODO spawn particle effects and sounds based on w_deathtype
        if(!DEATH_ISSPECIAL(w_deathtype))
+       if not(hitplayer && !rad) // don't show ground impacts for hitscan weapons if a player was hit
        {
                float hitwep;