vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: client: fix delta entity packet flush on GoldSrc protocol

Browse source 
Implement counting playerbytes for more accurate net_graph, even if we're
skipping this delta frame.
This commit is contained in:
Alibek Omarov 2025-01-20 19:38:40 +03:00
parent a1da10fe38
commit c5649c94d5
1 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
engine/client/cl_parse_gs.c
View file

@ -160,33 +160,47 @@ static int CL_GetEntityDelta( const struct delta_header_t *hdr, int entnum )
return DT_ENTITY_STATE_T; return DT_ENTITY_STATE_T;
} }
static void CL_FlushEntityPacketGS( frame_t *frame, sizebuf_t *msg ) static int CL_FlushEntityPacketGS( frame_t *frame, sizebuf_t *msg )
{ {
int playerbytes = 0, numbase = 0;
frame->valid = false; frame->valid = false;
cl.validsequence = 0; // can't render a frame cl.validsequence = 0; // can't render a frame
// read it all but ignore it // read it all but ignore it
while( 1 ) while( 1 )
{ {
int num = 0; int newnum, bufstart;
entity_state_t from = { 0 }, to; entity_state_t from = { 0 }, to;
delta_header_t hdr; delta_header_t hdr;
qboolean player;
if( MSG_ReadWord( msg ) != 0 ) if( MSG_ReadWord( msg ) != 0 )
{ {
MSG_SeekToBit( msg, -16, SEEK_CUR ); MSG_SeekToBit( msg, -16, SEEK_CUR );
num = CL_ParseDeltaHeader( msg, false, num, &hdr ); numbase = newnum = CL_ParseDeltaHeader( msg, true, numbase, &hdr );
} }
else break; else break;
if( MSG_CheckOverflow( msg )) if( MSG_CheckOverflow( msg ))
Host_Error( "%s: overflow\n", __func__ ); Host_Error( "%s: overflow\n", __func__ );
player = CL_IsPlayerIndex( newnum );
bufstart = MSG_GetNumBytesRead( msg );
if( hdr.remove ) if( hdr.remove )
continue; continue;
Delta_ReadGSFields( msg, CL_GetEntityDelta( &hdr, num ), &from, &to, cl.mtime[0] ); Delta_ReadGSFields( msg, CL_GetEntityDelta( &hdr, newnum ), &from, &to, cl.mtime[0] );
if( player )
playerbytes += MSG_GetNumBytesRead( msg ) - bufstart;
} }
if( MSG_CheckOverflow( msg ))
Host_Error( "%s: overflow\n", __func__ );
return playerbytes;
} }
static void CL_DeltaEntityGS( const delta_header_t *hdr, sizebuf_t *msg, frame_t *frame, int newnum, const entity_state_t *from ) static void CL_DeltaEntityGS( const delta_header_t *hdr, sizebuf_t *msg, frame_t *frame, int newnum, const entity_state_t *from )
@ -267,7 +281,7 @@ static void CL_CopyPacketEntity( frame_t *frame, int num, const entity_state_t *
static int CL_ParsePacketEntitiesGS( sizebuf_t *msg, qboolean delta ) static int CL_ParsePacketEntitiesGS( sizebuf_t *msg, qboolean delta )
{ {
frame_t *frame, *oldframe; frame_t *frame, *oldframe;
int oldindex, newnum, oldnum, numbase = 0; int oldindex, oldnum, numbase = 0;
entity_state_t *oldent; entity_state_t *oldent;
int count; int count;
int playerbytes = 0; int playerbytes = 0;
@ -314,7 +328,7 @@ static int CL_ParsePacketEntitiesGS( sizebuf_t *msg, qboolean delta )
// read it all but ignore it // read it all but ignore it
while( 1 ) while( 1 )
{ {
int bufstart; int bufstart, newnum;
qboolean player; qboolean player;
delta_header_t hdr; delta_header_t hdr;
int val = MSG_ReadWord( msg ); int val = MSG_ReadWord( msg );