Fix another bug with dead bodies. Also set the .owner entity of dead bodies to the...

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index 58924ed77651a91ee27987dc768ede7b2437e04d..468b6a0bb180fc53e2b1b7ddafd503cd7be02114 100644 (file)
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -148,6 +148,7 @@ void CopyBody(float keepvelocity)
 
        Violence_DamageEffect_Copy(oldself, self);
 
+       self.owner = oldself;
        self = oldself;
 }
 

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index cee0c28a68bf07aa97c9fc3db73b9c584fd77ed3..82b521364cea4ed6cfba9f1b6a38debdf3b14c73 100644 (file)
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -82,7 +82,13 @@ void Violence_DamageEffect(entity pl, float type)
        e.classname = "weapondamage";
        e.cnt = type;
        e.state |= 8 * pl.species; // gib type, ranges from 0 to 15
-       e.team = num_for_edict(pl);
+
+       // if this is a dead body, send the num of its player
+       if(pl.classname == "body")
+               e.team = num_for_edict(pl.owner);
+       else
+               e.team = num_for_edict(pl);
+
        setorigin(e, pl.origin);
 
        Net_LinkEntity(e, FALSE, 0.2, Violence_DamageEffect_SendEntity);