Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_violence.qc

diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
index ba2426718a571ca706958e8de9b6c3ad94b35a71..34d384c2833ad502a2c164992e2d68ac57481e35 100644 (file)
--- a/qcsrc/server/g_violence.qc
+++ b/qcsrc/server/g_violence.qc
@@ -27,8 +27,9 @@ void Violence_GibSplash_At(vector org, vector dir, float type, float amount, ent
        e.state |= 8 * self.species; // gib type, ranges from 0 to 15
 
        // if this is a copied dead body, send the num of its player instead
+       // TODO: remove this field, read from model txt files
        if(self.classname == "body")
-               e.team = num_for_edict(self.owner);
+               e.team = num_for_edict(self.enemy);
        else
                e.team = num_for_edict(self);