Kill damage effects when the player gets gibbed or goes spectating

diff --git a/qcsrc/client/damage.qc b/qcsrc/client/damage.qc
index 37030cef03e501d50be8ad3f1f0379ea42c3461d..c858f7eaa50f45f25d7e4b2ff94796e91d88d433 100644 (file)
--- a/qcsrc/client/damage.qc
+++ b/qcsrc/client/damage.qc
@@ -247,7 +247,7 @@ void DamageEffect_Think()
        self.nextthink = time;
        vector org;
 
-       if(time >= self.lifetime)
+       if(time >= self.lifetime || !self.owner.drawmask) // time is up or the player got gibbed / disconnected
        {
                remove(self);
                self = world;
@@ -312,6 +312,7 @@ void DamageEffect(vector hitorg, float dmg, float type, float specnum, float ent
        e = spawn();
        setmodel(e, "models/null.md3");
        setattachment(e, self, gettaginfo_name);
+       e.owner = self;
        e.classname = "damageeffect";
        e.team = entnumber;
        e.dmgpartnum = particleeffectnum(effectnum);