Merge remote-tracking branch 'origin/master' into Mario/weapons_new

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

diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc
index 4d208ebda808341f778f242ba0135d7255bd29d9..3dd93c0581a3433a4a16a37bfb75f5438f7a253b 100644 (file)
--- a/qcsrc/server/weapons/csqcprojectile.qc
+++ b/qcsrc/server/weapons/csqcprojectile.qc
@@ -48,6 +48,8 @@ float CSQCProjectile_SendEntity(entity to, float sf)
                        WriteByte(MSG_ENTITY, ft);
                        WriteByte(MSG_ENTITY, fr);
                }
+
+               WriteByte(MSG_ENTITY, self.realowner.team);
        }
 
        if(sf & 2)
@@ -85,10 +87,6 @@ void CSQCProjectile(entity e, float clientanimate, float type, float docull)
        e.csqcprojectile_type = type;
 }
 
-// FIXME HACK
-float ItemSend(entity to, float sf);
-void ItemUpdate(entity item);
-// END HACK
 void UpdateCSQCProjectile(entity e)
 {
        if(e.SendEntity == CSQCProjectile_SendEntity)