From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 4 Jan 2012 14:20:31 +0000 (+0200)
Subject: Get the correct species value. This fixes the last known bug for the damage effects... 
X-Git-Tag: xonotic-v0.6.0~110^2^2~75
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=da8cb9db8e6bf02b5c6adaa2b7e8512a06a78877;p=xonotic%2Fxonotic-data.pk3dir.git

Get the correct species value. This fixes the last known bug for the damage effects (except an issue with gibs)
---

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 495652cce..a9e8d4cbd 100644
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -288,9 +288,9 @@ void DamageEffect_Think()
 	self.dmgtime = time + autocvar_cl_damageeffect_player;
 }
 
-void DamageEffect(float dmg, float type, float specnum1, float entnumber)
+void DamageEffect(float dmg, float type, float specnum, float entnumber)
 {
-	float specnum2, life;
+	float life;
 	string specstr, effectnum;
 	entity e;
 
@@ -299,8 +299,7 @@ void DamageEffect(float dmg, float type, float specnum1, float entnumber)
 	if(autocvar_cl_gentle || autocvar_cl_gentle_damage)
 		return;
 
-	specnum2 = (specnum1 & 0x78) / 8; // blood type: using four bits (0..7, bit indexes 3,4,5)
-	specstr = species_prefix(specnum2);
+	specstr = species_prefix(specnum);
 	life = bound(0, dmg * autocvar_cl_damageeffect_lifetime, autocvar_cl_damageeffect_lifetime_max);
 
 	e = get_weaponinfo(type);