From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 4 Jan 2012 12:46:29 +0000 (+0200)
Subject: Some tweaks, and preparations for a fix
X-Git-Tag: xonotic-v0.6.0~110^2^2~82
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=53786a209467e5da2df529454e6cb70dc14e1fd6;p=xonotic%2Fxonotic-data.pk3dir.git

Some tweaks, and preparations for a fix
---

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 662c8fddb..635b467a0 100644
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -69,7 +69,7 @@ void Ent_DamageInfo(float isNew)
 		if(self.event_damage)
 			self.event_damage(thisdmg, w_deathtype, w_org, thisforce);
 	}
-	DamageEffect(dmg, w_deathtype, species, self.entnum);
+	DamageEffect(dmg, w_deathtype, species, self.entnum - 1);
 
 	self = oldself;
 	
@@ -313,7 +313,7 @@ void DamageEffect(float dmg, float type, float specnum1, float entnumber)
 	entity head;
 	for(head = world; (head = find(head, classname, "damageeffect")); )
 	{
-		if(head.team == entnumber - 1)
+		if(head.team == entnumber)
 		{
 			head.dmgpartnum = particleeffectnum(effectnum);
 			head.lifetime += life;
@@ -324,7 +324,7 @@ void DamageEffect(float dmg, float type, float specnum1, float entnumber)
 	entity e;
 	e = spawn();
 	e.classname = "damageeffect";
-	e.team = entnumber - 1;
+	e.team = entnumber;
 	e.dmgpartnum = particleeffectnum(effectnum);
 	e.lifetime = time + life;
 	e.think = DamageEffect_Think;
diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 90810c005..fbd66692a 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -37,7 +37,7 @@ void Damage_DamageInfo(vector org, float coredamage, float edgedamage, float rad
 	e.dmg_force = vlen(force);
 	e.velocity = force;
 	e.oldorigin_x = compressShortVector(e.velocity);
-	e.species |= 8 * dmgowner.species; // gib type, ranges from 0 to 15
+	e.species |= 0; // to be fixed
 
 	Net_LinkEntity(e, FALSE, 0.2, Damage_DamageInfo_SendEntity);
 }