Declare `.SendEntity` as `bool(entity, int)`

diff --git a/qcsrc/csqcmodellib/sv_model.qc b/qcsrc/csqcmodellib/sv_model.qc
index 425c985ad6926cb6a060f30e924ec33964e79ddf..32c8b870755997168cc9c7a708bcf9ac15f75923 100644 (file)
--- a/qcsrc/csqcmodellib/sv_model.qc
+++ b/qcsrc/csqcmodellib/sv_model.qc
@@ -36,7 +36,7 @@
 
 // generic CSQC model code
 
 
 // generic CSQC model code
 

-float CSQCModel_Send(entity to, int sf)
+bool CSQCModel_Send(entity to, int sf)

 {
        // some nice flags for CSQCMODEL_IF
        float isplayer = (IS_CLIENT(self));
 {
        // some nice flags for CSQCMODEL_IF
        float isplayer = (IS_CLIENT(self));

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index aa2648c0812b13c50ba0324620d25f1db2dada6b..860913f26a19b1903add1e799d8da56d68d9dace 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -347,7 +347,7 @@ float next_pingtime;
 
 .float Version;
 .int SendFlags;
 
 .float Version;
 .int SendFlags;

-.float(entity to, float sendflags) SendEntity;
+.bool(entity to, int sendflags) SendEntity;

 
 // player sounds, voice messages
 // TODO implemented fall and falling
 
 // player sounds, voice messages
 // TODO implemented fall and falling

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index c6e1a24e963ccbf1176b5512fe42856ec060ccaf..7660b7e03dae09a975b737c23ae48372640205d5 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1275,7 +1275,7 @@ void SetCustomizer(entity e, float(void) customizer, void(void) uncustomizer)
 }
 
 
 }
 
 

-void Net_LinkEntity(entity e, float docull, float dt, float(entity, float) sendfunc)
+void Net_LinkEntity(entity e, float docull, float dt, bool(entity, int) sendfunc)

 {
     vector mi, ma;
 
 {
     vector mi, ma;
 

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index 27b0e6cda393418a8afa5261951bbaf5631e0b04..72e3b09618538e218547b8d76a3dfbd4b5e53ce8 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -229,7 +229,7 @@ void ItemRead(float _IsNew)
 #endif
 
 #ifdef SVQC
 #endif
 
 #ifdef SVQC

-float ItemSend(entity to, int sf)
+bool ItemSend(entity to, int sf)

 {
     if(self.gravity)
         sf |= ISF_DROP;
 {
     if(self.gravity)
         sf |= ISF_DROP;

diff --git a/qcsrc/server/t_items.qh b/qcsrc/server/t_items.qh
index 000a4d2d8257bff917e06bc82786fc1e9470ffe3..ae4ecdb769375b17065136d95373c6411a9f7296 100644 (file)
--- a/qcsrc/server/t_items.qh
+++ b/qcsrc/server/t_items.qh
@@ -85,7 +85,7 @@ void ItemRead(float _IsNew);
 #endif
 #ifdef SVQC
 float autocvar_sv_simple_items;
 #endif
 #ifdef SVQC
 float autocvar_sv_simple_items;

-float ItemSend(entity to, int sf);
+bool ItemSend(entity to, int sf);

 
 
 float have_pickup_item(void);
 
 
 float have_pickup_item(void);


@@ -126,7 +126,7 @@ void Item_FindTeam();
 // Savage: used for item garbage-collection
 // TODO: perhaps nice special effect?
 
 // Savage: used for item garbage-collection
 // TODO: perhaps nice special effect?
 

-float ItemSend(entity to, int sf);
+bool ItemSend(entity to, int sf);

 void ItemUpdate(entity item);
 
 // pickup evaluation functions
 void ItemUpdate(entity item);
 
 // pickup evaluation functions

diff --git a/qcsrc/server/weapons/csqcprojectile.qc b/qcsrc/server/weapons/csqcprojectile.qc
index 773b7f085bea4e9c275501429895d251d176fca6..133e92d3fc9e529cdbe990dea1e7ee2154c749fa 100644 (file)
--- a/qcsrc/server/weapons/csqcprojectile.qc
+++ b/qcsrc/server/weapons/csqcprojectile.qc
@@ -13,7 +13,7 @@
 
 .float csqcprojectile_type;
 
 
 .float csqcprojectile_type;
 

-float CSQCProjectile_SendEntity(entity to, int sf)
+bool CSQCProjectile_SendEntity(entity to, int sf)

 {
        float ft, fr;
 
 {
        float ft, fr;
 


@@ -68,7 +68,7 @@ float CSQCProjectile_SendEntity(entity to, int sf)
        if(sf & 2)
                WriteByte(MSG_ENTITY, self.csqcprojectile_type); // TODO maybe put this into sf?
 
        if(sf & 2)
                WriteByte(MSG_ENTITY, self.csqcprojectile_type); // TODO maybe put this into sf?
 

-       return 1;
+       return true;

 }
 
 .vector csqcprojectile_oldorigin;
 }
 
 .vector csqcprojectile_oldorigin;

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index cc509d755f5c34592ce1f2d9175bdd2d6aa57e68..a9380070b7f7f77d57bca408ad03ba5c648bcc0d 100644 (file)
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -51,7 +51,7 @@ void WarpZone_TeleportPlayer(entity teleporter, entity player, vector to, vector
        WarpZone_PostTeleportPlayer_Callback(player);
 }
 
        WarpZone_PostTeleportPlayer_Callback(player);
 }
 

-float WarpZone_Teleported_Send(entity to, int sf)
+bool WarpZone_Teleported_Send(entity to, int sf)

 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_WARPZONE_TELEPORTED);
        WriteCoord(MSG_ENTITY, self.angles.x);
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_WARPZONE_TELEPORTED);
        WriteCoord(MSG_ENTITY, self.angles.x);


@@ -216,7 +216,7 @@ void WarpZone_Touch (void)
        }
 }
 
        }
 }
 

-float WarpZone_Send(entity to, float sendflags)
+bool WarpZone_Send(entity to, int sendflags)

 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_WARPZONE);
 
 {
        WriteByte(MSG_ENTITY, ENT_CLIENT_WARPZONE);
 


@@ -270,7 +270,7 @@ float WarpZone_Send(entity to, float sendflags)
        return true;
 }
 
        return true;
 }
 

-float WarpZone_Camera_Send(entity to, float sendflags)
+bool WarpZone_Camera_Send(entity to, int sendflags)

 {
        int f = 0;
        WriteByte(MSG_ENTITY, ENT_CLIENT_WARPZONE_CAMERA);
 {
        int f = 0;
        WriteByte(MSG_ENTITY, ENT_CLIENT_WARPZONE_CAMERA);