X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fweapons%2Fcsqcprojectile.qc;h=dfee551368a4863a3718d60d7ca7fa090a0db19c;hb=c741e6b3f012aa525f23e1df30d1d933b383fbc5;hp=36d037167bacb5d2fef195abf0b0b3ec4622eb90;hpb=c89dfaa4d0342b98c320621557973a65114fbdf4;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc index 36d037167..dfee55136 100644 --- a/qcsrc/server/weapons/csqcprojectile.qc +++ b/qcsrc/server/weapons/csqcprojectile.qc @@ -1,5 +1,4 @@ #include "csqcprojectile.qh" -#include "../_all.qh" #include "../t_items.qh" @@ -10,8 +9,8 @@ .float csqcprojectile_type; -bool CSQCProjectile_SendEntity(entity to, int sf) -{SELFPARAM(); +bool CSQCProjectile_SendEntity(entity this, entity to, int sf) +{ float ft, fr; // note: flag 0x08 = no trail please (teleport bit) @@ -35,7 +34,7 @@ bool CSQCProjectile_SendEntity(entity to, int sf) if(self.gravity != 0) sf |= 0x10; - WriteByte(MSG_ENTITY, ENT_CLIENT_PROJECTILE); + WriteHeader(MSG_ENTITY, ENT_CLIENT_PROJECTILE); WriteByte(MSG_ENTITY, sf); if(sf & 1) @@ -99,13 +98,13 @@ void CSQCProjectile(entity e, float clientanimate, int type, float docull) void UpdateCSQCProjectile(entity e) { - if(e.SendEntity == CSQCProjectile_SendEntity) + if(e.SendEntity3 == CSQCProjectile_SendEntity) { // send new origin data e.SendFlags |= 0x01; } // FIXME HACK - else if(e.SendEntity == ItemSend) + else if(e.SendEntity3 == ItemSend) { ItemUpdate(e); } @@ -114,7 +113,7 @@ void UpdateCSQCProjectile(entity e) void UpdateCSQCProjectileAfterTeleport(entity e) { - if(e.SendEntity == CSQCProjectile_SendEntity) + if(e.SendEntity3 == CSQCProjectile_SendEntity) { // send new origin data e.SendFlags |= 0x01;