From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 17 Apr 2012 09:36:30 +0000 (+0200)
Subject: detect headshots for minstanex again
X-Git-Tag: xonotic-v0.7.0~337
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3109ec4bce09b9bc670788df27e72772ef84739d;p=xonotic%2Fxonotic-data.pk3dir.git

detect headshots for minstanex again
---

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 7477e8e73..1fd0734a6 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -806,7 +806,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 		if(targ.takedamage == DAMAGE_AIM)
 		if(targ != attacker)
 		{
-			if(damage_headshotbonus > 0)
+			if(damage_headshotbonus)
 			{
 				if(targ.classname == "player")
 				{
@@ -827,7 +827,8 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 					deathtype |= HITTYPE_HEADSHOT;
 				}
 				if(deathtype & HITTYPE_HEADSHOT)
-					damage *= 1 + damage_headshotbonus;
+					if(damage_headshotbonus > 0)
+						damage *= 1 + damage_headshotbonus;
 			}
 
 			entity victim;
diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index aa8507905..1f1137e4b 100644
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -15,7 +15,9 @@ void W_MinstaNex_Attack (void)
 	yoda = 0;
 	damage_goodhits = 0;
 	headshot = 0;
+	damage_headshotbonus = -1; // no extra damage, just count
 	FireRailgunBullet (w_shotorg, w_shotorg + w_shotdir * MAX_SHOT_DISTANCE, 10000, 800, 0, 0, 0, 0, WEP_MINSTANEX);
+	damage_headshotbonus = 0;
 
 	if(g_minstagib)
 	{