engine: client: refactor and simplify CL_RegisterUserMessage

This commit is contained in:
Alibek Omarov 2024-12-20 01:47:22 +03:00
parent 85388e97c1
commit 0637dbaab1

View file

@ -1427,37 +1427,31 @@ register new user message or update existing
void CL_RegisterUserMessage( sizebuf_t *msg, connprotocol_t proto ) void CL_RegisterUserMessage( sizebuf_t *msg, connprotocol_t proto )
{ {
char *pszName; char *pszName;
int svc_num, size, bits; char szName[17];
int size;
svc_num = MSG_ReadByte( msg ); int svc_num = MSG_ReadByte( msg );
if( proto == PROTO_LEGACY || proto == PROTO_GOLDSRC ) if( proto == PROTO_LEGACY || proto == PROTO_GOLDSRC )
{ {
size = MSG_ReadByte( msg ); size = MSG_ReadByte( msg );
bits = 8; if( size == UINT8_MAX )
size = -1;
} }
else else
{ {
size = MSG_ReadWord( msg ); size = MSG_ReadWord( msg );
bits = 16; if( size == UINT16_MAX )
size = -1;
} }
if( proto == PROTO_GOLDSRC ) if( proto == PROTO_GOLDSRC )
{ {
static char szName[17];
MSG_ReadBytes( msg, szName, sizeof( szName ) - 1 ); MSG_ReadBytes( msg, szName, sizeof( szName ) - 1 );
szName[16] = 0; szName[16] = 0;
pszName = szName; pszName = szName;
} }
else pszName = MSG_ReadString( msg ); else pszName = MSG_ReadString( msg );
// important stuff
if( size == ( BIT( bits ) - 1 ) )
size = -1;
svc_num = bound( 0, svc_num, 255 );
CL_LinkUserMessage( pszName, svc_num, size ); CL_LinkUserMessage( pszName, svc_num, size );
} }