From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 26 Feb 2012 21:03:08 +0000 (+0200)
Subject: Fix the bug causing ground impacts to show when hitting a player with hitscan weapons
X-Git-Tag: xonotic-v0.6.0~42^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9c2dbc9130ae448cd79bf5739b5a3e5e4b1586fb;p=xonotic%2Fxonotic-data.pk3dir.git

Fix the bug causing ground impacts to show when hitting a player with hitscan weapons
---

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 34c15837a..d342738e9 100644
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -113,7 +113,7 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum)
 
 void Ent_DamageInfo(float isNew)
 {
-	float dmg, rad, edge, thisdmg, forcemul, species;
+	float dmg, rad, edge, thisdmg, forcemul, species, isplayer;
 	vector force, thisforce;
 	entity oldself;
 
@@ -188,6 +188,9 @@ void Ent_DamageInfo(float isNew)
 			self.event_damage(thisdmg, w_deathtype, w_org, thisforce);
 
 		DamageEffect(w_org, thisdmg, w_deathtype, species);
+
+		if(self.isplayermodel)
+			isplayer = TRUE; // this impact damaged a player
 	}
 
 	self = oldself;
@@ -325,6 +328,7 @@ void Ent_DamageInfo(float isNew)
 	
 	// TODO spawn particle effects and sounds based on w_deathtype
 	if(!DEATH_ISSPECIAL(w_deathtype))
+	if not(isplayer) // don't show ground impacts if a player was hit
 	{
 		float hitwep;