Enable damage effects on gibs again, and fix local player detection

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 6a5855fe42ab65200e20207123244fce8a4c52ab..03eb15f6ca871bc349039fc31f60896c6c881a2d 100644 (file)
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -255,17 +255,16 @@ void Ent_DamageEffect_Think()
                for(head = world; (head = find(head, classname, "gib")); )
                {
                        if(head.team == self.team)
-                       if(random() < autocvar_cl_damageeffect_gibs)
                                pointparticles(self.partnum, head.origin, '0 0 0', 1);
                }
        }
 
        // if we aren't in third person mode, hide our own damage effect
-       if(self.team == player_localentnum && !autocvar_chase_active)
+       if(self.team == player_localentnum - 1 && !autocvar_chase_active)
                return;
 
        // Now apply the effect to the actual player.
-               pointparticles(self.partnum, entcs.origin, '0 0 0', 1);
+       pointparticles(self.partnum, entcs.origin, '0 0 0', 1);
 }
 
 void Ent_DamageEffect()

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index eebad4c736374c437a7ab18768e14536d6cd1127..b40de4aa90f1f2c479ff55ecac75988224eeb63c 100644 (file)
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -115,7 +115,7 @@ void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector
        gib.solid = SOLID_CORPSE;
        gib.cnt = specnum;
        gib.silent = issilent;
-       gib.team = gibownernum;
+       gib.team = gibownernum - 1;
        Gib_setmodel(gib, mdlname, specnum);
 
        setsize (gib, '-8 -8 -8', '8 8 8');