]> de.git.xonotic.org Git - xonotic/darkplaces.git/blobdiff - protocol.c
ZQ_PAUSE extension patch from GreEn`mArine
[xonotic/darkplaces.git] / protocol.c
index 8413c65823a95c7bfc88601e667b334e7ef32030..f57ff66ae255b02a7ea87eb32520ae697e9115d3 100644 (file)
@@ -1,6 +1,22 @@
-
 #include "quakedef.h"
 
+#define ENTITYSIZEPROFILING_START(msg, num) \
+       int entityprofiling_startsize = msg->cursize
+
+#define ENTITYSIZEPROFILING_END(msg, num) \
+       if(developer_networkentities.integer >= 2) \
+       { \
+               prvm_edict_t *ed = prog->edicts + num; \
+               const char *cname = "(no classname)"; \
+               if(prog->fieldoffsets.classname >= 0) \
+               { \
+                       string_t handle =  PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.classname)->string; \
+                       if (handle) \
+                               cname = PRVM_GetString(handle); \
+               } \
+               Con_Printf("sent entity update of size %d for a %s\n", (msg->cursize - entityprofiling_startsize), cname); \
+       }
+
 // this is 88 bytes (must match entity_state_t in protocol.h)
 entity_state_t defaultstate =
 {
@@ -247,145 +263,342 @@ void EntityFrameQuake_ISeeDeadEntities(void)
        }
 }
 
-// FIXME FIXME FIXME: at this time the CSQC entity writing does not store
-// packet logs and thus if an update is lost it is never repeated, this makes
-// csqc entities useless at the moment.
+// NOTE: this only works with DP5 protocol and upwards. For lower protocols
+// (including QUAKE), no packet loss handling for CSQC is done, which makes
+// CSQC basically useless.
+// Always use the DP5 protocol, or a higher one, when using CSQC entities.
+static void EntityFrameCSQC_LostAllFrames(client_t *client)
+{
+       // mark ALL csqc entities as requiring a FULL resend!
+       // I know this is a bad workaround, but better than nothing.
+       int i, n;
+       prvm_eval_t *val;
+       prvm_edict_t *ed;
 
-void EntityFrameCSQC_WriteState (sizebuf_t *msg, int number, qboolean doupdate, qboolean *sectionstarted)
+       if(prog->fieldoffsets.SendEntity < 0 || prog->fieldoffsets.Version < 0)
+               return;
+
+       n = client->csqcnumedicts;
+       for(i = 0; i < n; ++i)
+       {
+               if(client->csqcentityglobalhistory[i])
+               {
+                       ed = prog->edicts + i;
+                       val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity);
+                       if (val->function)
+                               client->csqcentitysendflags[i] |= 0xFFFFFF; // FULL RESEND
+                       else // if it was ever sent to that client as a CSQC entity
+                       {
+                               client->csqcentityscope[i] = 1; // REMOVE
+                               client->csqcentitysendflags[i] |= 0xFFFFFF;
+                       }
+               }
+       }
+}
+void EntityFrameCSQC_LostFrame(client_t *client, int framenum)
 {
-       int version;
-       prvm_eval_t *val, *val2;
-       version = 0;
-       if (doupdate)
+       // marks a frame as lost
+       int i, j, n;
+       qboolean valid;
+       int ringfirst, ringlast;
+       int recoversendflags[MAX_EDICTS];
+       csqcentityframedb_t *d;
+
+       n = client->csqcnumedicts;
+
+       // is our frame out of history?
+       ringfirst = client->csqcentityframehistory_next; // oldest entry
+       ringlast = (ringfirst + NUM_CSQCENTITYDB_FRAMES - 1) % NUM_CSQCENTITYDB_FRAMES; // most recently added entry
+
+       valid = false;
+       
+       for(j = 0; j < NUM_CSQCENTITYDB_FRAMES; ++j)
        {
-               if (msg->cursize + !*sectionstarted + 2 + 1 + 2 > msg->maxsize)
+               d = &client->csqcentityframehistory[(ringfirst + j) % NUM_CSQCENTITYDB_FRAMES];
+               if(d->framenum < 0)
+                       continue;
+               if(d->framenum == framenum)
+                       break;
+               else if(d->framenum < framenum)
+                       valid = true;
+       }
+       if(j == NUM_CSQCENTITYDB_FRAMES)
+       {
+               if(valid) // got beaten, i.e. there is a frame < framenum
+               {
+                       // a non-csqc frame got lost... great
                        return;
-               val2 = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.Version);
-               version = (int)val2->_float;
-               // LordHavoc: do some validity checks on self.Version
-               // if self.Version reaches 255, it will soon exceed the byte used to
-               // store an entity version in the client struct, so we need to reset
-               // all the version to 1 and force all the existing clients' version of
-               // it to 255 (which we're not allowing to actually occur)
-               if (version < 0)
-                       val2->_float = 0;
-               if (version >= 255)
-               {
-                       int i;
-                       val2->_float = version = 1;
-                       // since we just reset the Version field to 1, it may accidentally
-                       // end up being equal to an existing client version now or in the
-                       // future, so to fix this situation we have to loop over all
-                       // clients and change their versions for this entity to be -1
-                       // which never matches, thus causing them to receive the update
-                       // soon, as they should
-                       for (i = 0;i < svs.maxclients;i++)
-                               if (svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number])
-                                       svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] = 255;
-               }
-       }
-       // if the version already matches, we don't need to do anything as the
-       // latest version has already been sent.
-       if (svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] == version)
+               }
+               else
+               {
+                       // a too old frame got lost... sorry, cannot handle this
+                       Con_DPrintf("CSQC entity DB: lost a frame too early to do any handling (resending ALL)...\n");
+                       Con_DPrintf("Lost frame = %d\n", framenum);
+                       Con_DPrintf("Entity DB = %d to %d\n", client->csqcentityframehistory[ringfirst].framenum, client->csqcentityframehistory[ringlast].framenum);
+                       EntityFrameCSQC_LostAllFrames(client);
+               }
                return;
-       if (version)
+       }
+
+       // so j is the frame that got lost
+       // ringlast is the frame that we have to go to
+       ringfirst = (ringfirst + j) % NUM_CSQCENTITYDB_FRAMES;
+       if(ringlast < ringfirst)
+               ringlast += NUM_CSQCENTITYDB_FRAMES;
+       
+       memset(recoversendflags, 0, sizeof(recoversendflags));
+
+       for(j = ringfirst; j <= ringlast; ++j)
        {
-               // if there's no SendEntity function, treat it as a remove
-               val = PRVM_EDICTFIELDVALUE((&prog->edicts[number]), prog->fieldoffsets.SendEntity);
-               if (val->function)
+               d = &client->csqcentityframehistory[j % NUM_CSQCENTITYDB_FRAMES];
+               if(d->framenum < 0)
                {
-                       // there is a function to call, save the cursize value incase we
-                       // have to do a rollback due to overflow
-                       int oldcursize = msg->cursize;
-                       if(!*sectionstarted)
-                               MSG_WriteByte(msg, svc_csqcentities);
-                       MSG_WriteShort(msg, number);
-                       PRVM_G_INT(OFS_PARM0) = sv.writeentitiestoclient_cliententitynumber;
-                       prog->globals.server->self = number;
-                       PRVM_ExecuteProgram(val->function, "Null SendEntity\n");
-                       if(PRVM_G_FLOAT(OFS_RETURN))
+                       // deleted frame
+               }
+               else if(d->framenum < framenum)
+               {
+                       // a frame in the past... should never happen
+                       Con_Printf("CSQC entity DB encountered a frame from the past when recovering from PL...?\n");
+               }
+               else if(d->framenum == framenum)
+               {
+                       // handling the actually lost frame now
+                       for(i = 0; i < d->num; ++i)
                        {
-                               if (msg->cursize + 2 > msg->maxsize)
-                               {
-                                       // if the packet no longer has enough room to write the
-                                       // final index code that ends the message, rollback to the
-                                       // state before we tried to write anything and then return
-                                       msg->cursize = oldcursize;
-                                       msg->overflowed = false;
-                                       return;
-                               }
-                               // an update has been successfully written, update the version
-                               svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] = version;
-                               // and take note that we have begun the svc_csqcentities
-                               // section of the packet
-                               *sectionstarted = 1;
-                               return;
+                               int sf = d->sendflags[i];
+                               int ent = d->entno[i];
+                               if(sf < 0) // remove
+                                       recoversendflags[ent] |= -1; // all bits, including sign
+                               else if(sf > 0)
+                                       recoversendflags[ent] |= sf;
                        }
-                       else
+               }
+               else
+               {
+                       // handling the frames that followed it now
+                       for(i = 0; i < d->num; ++i)
                        {
-                               // rollback the buffer to its state before the writes
-                               msg->cursize = oldcursize;
-                               // if the function returned FALSE, simply write a remove
-                               // this is done by falling through to the remove code below
-                               version = 0;
+                               int sf = d->sendflags[i];
+                               int ent = d->entno[i];
+                               if(sf < 0) // remove
+                               {
+                                       recoversendflags[ent] = 0; // no need to update, we got a more recent remove (and will fix it THEN)
+                                       break; // no flags left to remove...
+                               }
+                               else if(sf > 0)
+                                       recoversendflags[ent] &= ~sf; // no need to update these bits, we already got them later
                        }
                }
        }
-       // write a remove message if needed
-       // if already removed, do nothing
-       if (!svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number])
-               return;
-       // if there isn't enough room to write the remove message, just return, as
-       // it will be handled in a later packet
-       if (msg->cursize + !*sectionstarted + 2 + 2 > msg->maxsize)
-               return;
-       // first write the message identifier if needed
-       if(!*sectionstarted)
+
+       for(i = 0; i < client->csqcnumedicts; ++i)
        {
-               *sectionstarted = 1;
-               MSG_WriteByte(msg, svc_csqcentities);
+               if(recoversendflags[i] < 0)
+               {
+                       // a remove got lost, then either send a remove or - if it was
+                       // recreated later - a FULL update to make totally sure
+                       client->csqcentityscope[i] = 1;
+                       client->csqcentitysendflags[i] = 0xFFFFFF;
+               }
+               else
+                       client->csqcentitysendflags[i] |= recoversendflags[i];
        }
-       // write the remove message
-       MSG_WriteShort(msg, (unsigned short)number | 0x8000);
-       svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[number] = 0;
+}
+static int EntityFrameCSQC_AllocFrame(client_t *client, int framenum)
+{
+       int ringfirst = client->csqcentityframehistory_next; // oldest entry
+       client->csqcentityframehistory_next += 1;
+       client->csqcentityframehistory_next %= NUM_CSQCENTITYDB_FRAMES;
+       client->csqcentityframehistory[ringfirst].framenum = framenum;
+       client->csqcentityframehistory[ringfirst].num = 0;
+       return ringfirst;
+}
+static void EntityFrameCSQC_DeallocFrame(client_t *client, int framenum)
+{
+       int ringfirst = client->csqcentityframehistory_next; // oldest entry
+       int ringlast = (ringfirst + NUM_CSQCENTITYDB_FRAMES - 1) % NUM_CSQCENTITYDB_FRAMES; // most recently added entry
+       if(framenum == client->csqcentityframehistory[ringlast].framenum)
+       {
+               client->csqcentityframehistory[ringlast].framenum = -1;
+               client->csqcentityframehistory[ringlast].num = 0;
+               client->csqcentityframehistory_next = ringlast;
+       }
+       else
+               Con_Printf("Trying to dealloc the wrong entity frame\n");
 }
 
 //[515]: we use only one array per-client for SendEntity feature
-void EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int numstates, const entity_state_t *states)
+// TODO: add some handling for entity send priorities, to better deal with huge
+// amounts of csqc networked entities
+qboolean EntityFrameCSQC_WriteFrame (sizebuf_t *msg, int maxsize, int numstates, const entity_state_t *states, int framenum)
 {
-       int i, num;
+       int num, number, end, sendflags;
        qboolean sectionstarted = false;
        const entity_state_t *n;
+       prvm_edict_t *ed;
+       prvm_eval_t *val;
+       client_t *client = svs.clients + sv.writeentitiestoclient_clientnumber;
+       int dbframe = EntityFrameCSQC_AllocFrame(client, framenum);
+       csqcentityframedb_t *db = &client->csqcentityframehistory[dbframe];
+
+       maxsize -= 24; // always fit in an empty svc_entities message (for packet loss detection!)
 
        // if this server progs is not CSQC-aware, return early
        if(prog->fieldoffsets.SendEntity < 0 || prog->fieldoffsets.Version < 0)
-               return;
+               return false;
+
        // make sure there is enough room to store the svc_csqcentities byte,
        // the terminator (0x0000) and at least one entity update
-       if (msg->cursize + 32 >= msg->maxsize)
-               return;
+       if (msg->cursize + 32 >= maxsize)
+               return false;
 
-       num = 1;
+       if (client->csqcnumedicts < prog->num_edicts)
+               client->csqcnumedicts = prog->num_edicts;
+
+       number = 1;
+       for (num = 0, n = states;num < numstates;num++, n++)
+       {
+               end = n->number;
+               for (;number < end;number++)
+               {
+                       if (client->csqcentityscope[number])
+                       {
+                               client->csqcentityscope[number] = 1;
+                               client->csqcentitysendflags[number] = 0xFFFFFF;
+                       }
+               }
+               ed = prog->edicts + number;
+               val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity);
+               if (val->function)
+                       client->csqcentityscope[number] = 2;
+               else if (client->csqcentityscope[number])
+               {
+                       client->csqcentityscope[number] = 1;
+                       client->csqcentitysendflags[number] = 0xFFFFFF;
+               }
+               number++;
+       }
+       end = client->csqcnumedicts;
+       for (;number < end;number++)
+       {
+               if (client->csqcentityscope[number])
+               {
+                       client->csqcentityscope[number] = 1;
+                       client->csqcentitysendflags[number] = 0xFFFFFF;
+               }
+       }
+
+       /*
+       // mark all scope entities as remove
+       for (number = 1;number < client->csqcnumedicts;number++)
+               if (client->csqcentityscope[number])
+                       client->csqcentityscope[number] = 1;
+       // keep visible entities
        for (i = 0, n = states;i < numstates;i++, n++)
        {
-               // all entities between the previous entity state and this one are dead
-               for (;num < n->number;num++)
-                       if(svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[num])
-                               EntityFrameCSQC_WriteState(msg, num, false, &sectionstarted);
-               // update this entity
-               EntityFrameCSQC_WriteState(msg, num, true, &sectionstarted);
-               // advance to next entity so the next iteration doesn't immediately remove it
-               num++;
+               number = n->number;
+               ed = prog->edicts + number;
+               val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity);
+               if (val->function)
+                       client->csqcentityscope[number] = 2;
+       }
+       */
+
+       // now try to emit the entity updates
+       // (FIXME: prioritize by distance?)
+       end = client->csqcnumedicts;
+       for (number = 1;number < end;number++)
+       {
+               if (!client->csqcentityscope[number])
+                       continue;
+               sendflags = client->csqcentitysendflags[number];
+               if (!sendflags)
+                       continue;
+               if(db->num >= NUM_CSQCENTITIES_PER_FRAME)
+                       break;
+               ed = prog->edicts + number;
+               // entity scope is either update (2) or remove (1)
+               if (client->csqcentityscope[number] == 1)
+               {
+                       // write a remove message
+                       // first write the message identifier if needed
+                       if(!sectionstarted)
+                       {
+                               sectionstarted = 1;
+                               MSG_WriteByte(msg, svc_csqcentities);
+                       }
+                       // write the remove message
+                       {
+                               ENTITYSIZEPROFILING_START(msg, number);
+                               MSG_WriteShort(msg, (unsigned short)number | 0x8000);
+                               client->csqcentityscope[number] = 0;
+                               client->csqcentitysendflags[number] = 0xFFFFFF; // resend completely if it becomes active again
+                               db->entno[db->num] = number;
+                               db->sendflags[db->num] = -1;
+                               db->num += 1;
+                               client->csqcentityglobalhistory[number] = 1;
+                               ENTITYSIZEPROFILING_END(msg, number);
+                       }
+                       if (msg->cursize + 17 >= maxsize)
+                               break;
+               }
+               else
+               {
+                       // write an update
+                       // save the cursize value in case we overflow and have to rollback
+                       int oldcursize = msg->cursize;
+                       client->csqcentityscope[number] = 1;
+                       val = PRVM_EDICTFIELDVALUE(ed, prog->fieldoffsets.SendEntity);
+                       if (val->function)
+                       {
+                               if(!sectionstarted)
+                                       MSG_WriteByte(msg, svc_csqcentities);
+                               {
+                                       ENTITYSIZEPROFILING_START(msg, number);
+                                       MSG_WriteShort(msg, number);
+                                       msg->allowoverflow = true;
+                                       PRVM_G_INT(OFS_PARM0) = sv.writeentitiestoclient_cliententitynumber;
+                                       PRVM_G_FLOAT(OFS_PARM1) = sendflags;
+                                       prog->globals.server->self = number;
+                                       PRVM_ExecuteProgram(val->function, "Null SendEntity\n");
+                                       msg->allowoverflow = false;
+                                       if(PRVM_G_FLOAT(OFS_RETURN) && msg->cursize + 2 <= maxsize)
+                                       {
+                                               // an update has been successfully written
+                                               client->csqcentitysendflags[number] = 0;
+                                               db->entno[db->num] = number;
+                                               db->sendflags[db->num] = sendflags;
+                                               db->num += 1;
+                                               client->csqcentityglobalhistory[number] = 1;
+                                               // and take note that we have begun the svc_csqcentities
+                                               // section of the packet
+                                               sectionstarted = 1;
+                                               ENTITYSIZEPROFILING_END(msg, number);
+                                               if (msg->cursize + 17 >= maxsize)
+                                                       break;
+                                               continue;
+                                       }
+                               }
+                       }
+                       // self.SendEntity returned false (or does not exist) or the
+                       // update was too big for this packet - rollback the buffer to its
+                       // state before the writes occurred, we'll try again next frame
+                       msg->cursize = oldcursize;
+                       msg->overflowed = false;
+               }
        }
-       // all remaining entities are dead
-       for (;num < prog->num_edicts;num++)
-               if(svs.clients[sv.writeentitiestoclient_clientnumber].csqcentityversion[num])
-                       EntityFrameCSQC_WriteState(msg, num, false, &sectionstarted);
        if (sectionstarted)
        {
                // write index 0 to end the update (0 is never used by real entities)
                MSG_WriteShort(msg, 0);
        }
+
+       if(db->num == 0)
+               // if no single ent got added, remove the frame from the DB again, to allow
+               // for a larger history
+               EntityFrameCSQC_DeallocFrame(client, framenum);
+       
+       return sectionstarted;
 }
 
 void Protocol_UpdateClientStats(const int *stats)
@@ -467,7 +680,7 @@ void Protocol_WriteStatsReliable(void)
 }
 
 
-void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_state_t *states)
+void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int maxsize, int numstates, const entity_state_t *states)
 {
        const entity_state_t *s;
        entity_state_t baseline;
@@ -483,6 +696,7 @@ void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_sta
 
        for (i = 0, s = states;i < numstates;i++, s++)
        {
+               ENTITYSIZEPROFILING_START(msg, s->number);
                val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity);
                if(val && val->function)
                        continue;
@@ -619,13 +833,14 @@ void EntityFrameQuake_WriteFrame(sizebuf_t *msg, int numstates, const entity_sta
                }
 
                // if the commit is full, we're done this frame
-               if (msg->cursize + buf.cursize > msg->maxsize)
+               if (msg->cursize + buf.cursize > maxsize)
                {
                        // next frame we will continue where we left off
                        break;
                }
                // write the message to the packet
                SZ_Write(msg, buf.data, buf.cursize);
+               ENTITYSIZEPROFILING_END(msg, s->number);
        }
 }
 
@@ -811,6 +1026,7 @@ void EntityState_WriteFields(const entity_state_t *ent, sizebuf_t *msg, unsigned
 void EntityState_WriteUpdate(const entity_state_t *ent, sizebuf_t *msg, const entity_state_t *delta)
 {
        unsigned int bits;
+       ENTITYSIZEPROFILING_START(msg, ent->number);
        if (ent->active)
        {
                // entity is active, check for changes from the delta
@@ -831,6 +1047,7 @@ void EntityState_WriteUpdate(const entity_state_t *ent, sizebuf_t *msg, const en
                        MSG_WriteShort(msg, ent->number | 0x8000);
                }
        }
+       ENTITYSIZEPROFILING_END(msg, ent->number);
 }
 
 int EntityState_ReadExtendBits(void)
@@ -1114,7 +1331,7 @@ void EntityFrame_AddFrame(entityframe_database_t *d, vec3_t eye, int framenum, i
 }
 
 // (server) writes a frame to network stream
-void EntityFrame_WriteFrame(sizebuf_t *msg, entityframe_database_t *d, int numstates, const entity_state_t *states, int viewentnum)
+void EntityFrame_WriteFrame(sizebuf_t *msg, int maxsize, entityframe_database_t *d, int numstates, const entity_state_t *states, int viewentnum)
 {
        int i, onum, number;
        entity_frame_t *o = &d->deltaframe;
@@ -1590,7 +1807,7 @@ void EntityFrame4_CL_ReadFrame(void)
                EntityFrame4_ResetDatabase(d);
 }
 
-void EntityFrame4_WriteFrame(sizebuf_t *msg, entityframe4_database_t *d, int numstates, const entity_state_t *states)
+void EntityFrame4_WriteFrame(sizebuf_t *msg, int maxsize, entityframe4_database_t *d, int numstates, const entity_state_t *states)
 {
        const entity_state_t *e, *s;
        entity_state_t inactiveentitystate;
@@ -1600,7 +1817,7 @@ void EntityFrame4_WriteFrame(sizebuf_t *msg, entityframe4_database_t *d, int num
        prvm_eval_t *val;
 
        // if there isn't enough space to accomplish anything, skip it
-       if (msg->cursize + 24 > msg->maxsize)
+       if (msg->cursize + 24 > maxsize)
                return;
 
        // prepare the buffer
@@ -1670,7 +1887,7 @@ void EntityFrame4_WriteFrame(sizebuf_t *msg, entityframe4_database_t *d, int num
                        }
                }
                // if the commit is full, we're done this frame
-               if (msg->cursize + buf.cursize > msg->maxsize - 4)
+               if (msg->cursize + buf.cursize > maxsize - 4)
                {
                        // next frame we will continue where we left off
                        break;
@@ -1717,7 +1934,7 @@ void EntityFrame5_FreeDatabase(entityframe5_database_t *d)
        Mem_Free(d);
 }
 
-void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax)
+static void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax)
 {
        if (d->maxedicts < newmax)
        {
@@ -1748,7 +1965,7 @@ void EntityFrame5_ExpandEdicts(entityframe5_database_t *d, int newmax)
        }
 }
 
-int EntityState5_Priority(entityframe5_database_t *d, int stateindex)
+static int EntityState5_Priority(entityframe5_database_t *d, int stateindex)
 {
        int limit, priority;
        entity_state_t *s;
@@ -1794,6 +2011,7 @@ int EntityState5_Priority(entityframe5_database_t *d, int stateindex)
 void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbits, sizebuf_t *msg)
 {
        unsigned int bits = 0;
+       ENTITYSIZEPROFILING_START(msg, s->number);
 
        prvm_eval_t *val;
        val = PRVM_EDICTFIELDVALUE((&prog->edicts[s->number]), prog->fieldoffsets.SendEntity);
@@ -1932,9 +2150,11 @@ void EntityState5_WriteUpdate(int number, const entity_state_t *s, int changedbi
                        MSG_WriteByte(msg, s->colormod[2]);
                }
        }
+
+       ENTITYSIZEPROFILING_END(msg, s->number);
 }
 
-void EntityState5_ReadUpdate(entity_state_t *s, int number)
+static void EntityState5_ReadUpdate(entity_state_t *s, int number)
 {
        int bits;
        bits = MSG_ReadByte();
@@ -2100,7 +2320,7 @@ void EntityState5_ReadUpdate(entity_state_t *s, int number)
        }
 }
 
-int EntityState5_DeltaBits(const entity_state_t *o, const entity_state_t *n)
+static int EntityState5_DeltaBits(const entity_state_t *o, const entity_state_t *n)
 {
        unsigned int bits = 0;
        if (n->active)
@@ -2277,7 +2497,7 @@ void EntityFrame5_AckFrame(entityframe5_database_t *d, int framenum)
                        d->packetlog[i].packetnumber = 0;
 }
 
-void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int movesequence)
+void EntityFrame5_WriteFrame(sizebuf_t *msg, int maxsize, entityframe5_database_t *d, int numstates, const entity_state_t *states, int viewentnum, int movesequence, qboolean need_empty)
 {
        const entity_state_t *n;
        int i, num, l, framenum, packetlognumber, priority;
@@ -2389,7 +2609,7 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num
        // write stat updates
        if (sv.protocol != PROTOCOL_QUAKE && sv.protocol != PROTOCOL_QUAKEDP && sv.protocol != PROTOCOL_NEHAHRAMOVIE && sv.protocol != PROTOCOL_NEHAHRABJP && sv.protocol != PROTOCOL_NEHAHRABJP2 && sv.protocol != PROTOCOL_NEHAHRABJP3 && sv.protocol != PROTOCOL_DARKPLACES1 && sv.protocol != PROTOCOL_DARKPLACES2 && sv.protocol != PROTOCOL_DARKPLACES3 && sv.protocol != PROTOCOL_DARKPLACES4 && sv.protocol != PROTOCOL_DARKPLACES5)
        {
-               for (i = 0;i < MAX_CL_STATS && msg->cursize + 6 + 11 <= msg->maxsize;i++)
+               for (i = 0;i < MAX_CL_STATS && msg->cursize + 6 + 11 <= maxsize;i++)
                {
                        if (host_client->statsdeltabits[i>>3] & (1<<(i&7)))
                        {
@@ -2400,16 +2620,23 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num
                                        MSG_WriteByte(msg, svc_updatestatubyte);
                                        MSG_WriteByte(msg, i);
                                        MSG_WriteByte(msg, host_client->stats[i]);
+                                       l = 1;
                                }
                                else
                                {
                                        MSG_WriteByte(msg, svc_updatestat);
                                        MSG_WriteByte(msg, i);
                                        MSG_WriteLong(msg, host_client->stats[i]);
+                                       l = 1;
                                }
                        }
                }
        }
+
+       // only send empty svc_entities frame if needed
+       if(!l && !need_empty)
+               return;
+
        // write state updates
        if (developer_networkentities.integer >= 10)
                Con_Printf("send: svc_entities %i\n", framenum);
@@ -2429,7 +2656,7 @@ void EntityFrame5_WriteFrame(sizebuf_t *msg, entityframe5_database_t *d, int num
                        buf.cursize = 0;
                        EntityState5_WriteUpdate(num, n, d->deltabits[num], &buf);
                        // if the entity won't fit, try the next one
-                       if (msg->cursize + buf.cursize + 2 > msg->maxsize)
+                       if (msg->cursize + buf.cursize + 2 > maxsize)
                                continue;
                        // write entity to the packet
                        SZ_Write(msg, buf.data, buf.cursize);