Some tweaks, and preparations for a fix

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 662c8fddb9ee7076a2609eb905aa6cfcf01bd458..635b467a0569e751ddb46c4ac7238973927d3c8b 100644 (file)
--- 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 90810c00514fc5494f0ef356b0c2c6f8f71ba3e1..fbd66692ae5dc840a5d3e69f5d4a96c1345ebb39 100644 (file)
--- 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);
 }