From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 24 Nov 2010 20:15:36 +0000 (+0100)
Subject: do announcer messages for bullets only for the rifle
X-Git-Tag: xonotic-v0.1.0preview~104
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3fd329063fde6a1e366c16497858035632a576e4;p=xonotic%2Fxonotic-data.pk3dir.git

do announcer messages for bullets only for the rifle
---

diff --git a/qcsrc/server/w_common.qc b/qcsrc/server/w_common.qc
index 600f260f4..2dd97c831 100644
--- a/qcsrc/server/w_common.qc
+++ b/qcsrc/server/w_common.qc
@@ -180,16 +180,15 @@ void W_BallisticBullet_Hit (void)
 		Damage(other, self, self.owner, self.dmg * f, self.projectiledeathtype, self.origin, self.dmg_force * normalize(self.velocity) * f);
 		damage_headshotbonus = 0;
 
-		if(self.dmg_edge != 0)
+		if(headshot)
+			f *= q;
+		if(DEATH_WEAPONOF(self.projectiledeathtype) == WEP_CAMPINGRIFLE)
 		{
 			if(headshot)
-			{	
-				f *= q;
 				AnnounceTo(self.owner, "headshot");
-			}
+			if(yoda)
+				AnnounceTo(self.owner, "awesome");
 		}
-		if(yoda)
-			AnnounceTo(self.owner, "awesome");
 
 		// calculate hits for ballistic weapons
 		if(g)