From 0d4296e0e161db2d6c5f0907c6948e8ed72bc49f Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Mon, 14 Oct 2024 03:24:07 +0300 Subject: [PATCH] engine: client: explicitly pass protocol to svc_time parser --- engine/client/cl_parse.c | 6 +++--- engine/client/cl_parse_48.c | 2 +- engine/client/cl_parse_gs.c | 2 +- engine/client/cl_qparse.c | 2 +- engine/client/client.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/engine/client/cl_parse.c b/engine/client/cl_parse.c index 80c12ff2..074403ad 100644 --- a/engine/client/cl_parse.c +++ b/engine/client/cl_parse.c @@ -181,14 +181,14 @@ CL_ParseServerTime ================== */ -void CL_ParseServerTime( sizebuf_t *msg ) +void CL_ParseServerTime( sizebuf_t *msg, connprotocol_t proto ) { double dt; cl.mtime[1] = cl.mtime[0]; cl.mtime[0] = MSG_ReadFloat( msg ); - if( cls.legacymode == PROTO_QUAKE ) + if( proto == PROTO_QUAKE ) return; // don't mess the time if( cl.maxclients == 1 ) @@ -2544,7 +2544,7 @@ void CL_ParseServerMessage( sizebuf_t *msg ) cl.frames[cl.parsecountmod].graphdata.sound += MSG_GetNumBytesRead( msg ) - bufStart; break; case svc_time: - CL_ParseServerTime( msg ); + CL_ParseServerTime( msg, PROTO_CURRENT ); break; case svc_print: Con_Printf( "%s", MSG_ReadString( msg )); diff --git a/engine/client/cl_parse_48.c b/engine/client/cl_parse_48.c index 8916fc89..6325d700 100644 --- a/engine/client/cl_parse_48.c +++ b/engine/client/cl_parse_48.c @@ -419,7 +419,7 @@ void CL_ParseLegacyServerMessage( sizebuf_t *msg ) break; case svc_time: - CL_ParseServerTime( msg ); + CL_ParseServerTime( msg, PROTO_LEGACY ); break; case svc_print: Con_Printf( "%s", MSG_ReadString( msg )); diff --git a/engine/client/cl_parse_gs.c b/engine/client/cl_parse_gs.c index 58c43d07..e4611cfb 100644 --- a/engine/client/cl_parse_gs.c +++ b/engine/client/cl_parse_gs.c @@ -570,7 +570,7 @@ void CL_ParseGoldSrcServerMessage( sizebuf_t *msg ) cl.frames[cl.parsecountmod].graphdata.sound += MSG_GetNumBytesRead( msg ) - bufStart; break; case svc_time: - CL_ParseServerTime( msg ); + CL_ParseServerTime( msg, PROTO_GOLDSRC ); break; case svc_print: Con_Printf( "%s", MSG_ReadString( msg )); diff --git a/engine/client/cl_qparse.c b/engine/client/cl_qparse.c index 9e52c068..992d8b15 100644 --- a/engine/client/cl_qparse.c +++ b/engine/client/cl_qparse.c @@ -950,7 +950,7 @@ void CL_ParseQuakeMessage( sizebuf_t *msg ) break; case svc_time: Cbuf_AddText( "\n" ); // new frame was started - CL_ParseServerTime( msg ); + CL_ParseServerTime( msg, PROTO_QUAKE ); break; case svc_print: str = MSG_ReadString( msg ); diff --git a/engine/client/client.h b/engine/client/client.h index 6ed47778..e1623d68 100644 --- a/engine/client/client.h +++ b/engine/client/client.h @@ -896,7 +896,7 @@ qboolean CL_DispatchUserMessage( const char *pszName, int iSize, void *pbuf ); qboolean CL_RequestMissingResources( void ); void CL_RegisterResources( sizebuf_t *msg, connprotocol_t proto ); void CL_ParseViewEntity( sizebuf_t *msg ); -void CL_ParseServerTime( sizebuf_t *msg ); +void CL_ParseServerTime( sizebuf_t *msg, connprotocol_t proto ); void CL_ParseUserMessage( sizebuf_t *msg, int svc_num, connprotocol_t proto ); void CL_ParseFinaleCutscene( sizebuf_t *msg, int level ); void CL_ParseTextMessage( sizebuf_t *msg );