RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: add support for legacy 'm' query responses

Browse Source
This commit is contained in:
Владислав Сухов
2026-05-30 21:56:35 +00:00
committed by a1batross
parent bf5d88d9a4
commit a60d0d142d
2 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
engine/client/cl_main.c
View File

@@ -2074,7 +2074,7 @@ static void CL_ParseStatusMessage( netadr_t from, sizebuf_t *msg )
UI_AddServerToList( from, infostring );
}
static void CL_ParseGoldSrcStatusMessage( netadr_t from, sizebuf_t *msg )
static void CL_ParseGoldSrcStatusMessage( netadr_t from, sizebuf_t *msg, qboolean legacy_format )
{
static char s[512+8];
int p, numcl, maxcl, password, remaining, bots;
@@ -2084,19 +2084,58 @@ static void CL_ParseGoldSrcStatusMessage( netadr_t from, sizebuf_t *msg )
// set to beginning but skip header
MSG_SeekToBit( msg, (sizeof( uint32_t ) + sizeof( uint8_t )) << 3, SEEK_SET );
p = MSG_ReadByte( msg );
Q_strncpy( host, MSG_ReadString( msg ), sizeof( host ));
Q_strncpy( map, MSG_ReadString( msg ), sizeof( map ));
Q_strncpy( gamedir, MSG_ReadString( msg ), sizeof( gamedir ));
MSG_ReadString( msg ); // game description
MSG_ReadShort( msg ); // app id
numcl = MSG_ReadByte( msg );
maxcl = MSG_ReadByte( msg );
bots = MSG_ReadByte( msg ); // bots count
MSG_ReadByte( msg ); // dedicated
MSG_ReadByte( msg ); // operating system
password = MSG_ReadByte( msg );
Q_strncpy( version, MSG_ReadString( msg ), sizeof( version ));
if( legacy_format )
{
string address;
int mod;
p = MSG_ReadByte( msg );
Q_strncpy( address, MSG_ReadString( msg ), sizeof( address ));
Q_strncpy( host, MSG_ReadString( msg ), sizeof( host ));
Q_strncpy( map, MSG_ReadString( msg ), sizeof( map ));
Q_strncpy( gamedir, MSG_ReadString( msg ), sizeof( gamedir ));
MSG_ReadString( msg ); // game description
numcl = MSG_ReadByte( msg );
maxcl = MSG_ReadByte( msg );
MSG_ReadByte( msg ); // protocol version
MSG_ReadByte( msg ); // server type
MSG_ReadByte( msg ); // operating system
password = MSG_ReadByte( msg );
mod = MSG_ReadByte( msg ); // mod flag
if( mod == 1 )
{
MSG_ReadString( msg ); // mod URL
MSG_ReadString( msg ); // mod download URL
MSG_ReadLong( msg ); // mod version
MSG_ReadLong( msg ); // mod size
MSG_ReadByte( msg ); // mod type (SP/MP)
MSG_ReadByte( msg ); // custom DLL flag
Q_strncpy( version, MSG_ReadString( msg ), sizeof( version ));
bots = MSG_ReadByte( msg ); // bots count
}
else
{
Q_strncpy( version, MSG_ReadString( msg ), sizeof( version ));
bots = MSG_ReadByte( msg ); // bots count
}
}
else
{
p = MSG_ReadByte( msg );
Q_strncpy( host, MSG_ReadString( msg ), sizeof( host ));
Q_strncpy( map, MSG_ReadString( msg ), sizeof( map ));
Q_strncpy( gamedir, MSG_ReadString( msg ), sizeof( gamedir ));
MSG_ReadString( msg ); // game description
MSG_ReadShort( msg ); // app id
numcl = MSG_ReadByte( msg );
maxcl = MSG_ReadByte( msg );
bots = MSG_ReadByte( msg ); // bots count
MSG_ReadByte( msg ); // server type
MSG_ReadByte( msg ); // operating system
password = MSG_ReadByte( msg );
Q_strncpy( version, MSG_ReadString( msg ), sizeof( version ));
}
// sanity check
if( maxcl > MAX_CLIENTS || numcl > MAX_CLIENTS || bots > MAX_CLIENTS || numcl > maxcl || bots > maxcl )
@@ -2657,7 +2696,11 @@ static void CL_ConnectionlessPacket( netadr_t from, sizebuf_t *msg )
}
else if( c[0] == S2A_GOLDSRC_INFO )
{
CL_ParseGoldSrcStatusMessage( from, msg );
CL_ParseGoldSrcStatusMessage( from, msg, false );
}
else if( c[0] == S2A_GOLDSRC_LEGACY_INFO )
{
CL_ParseGoldSrcStatusMessage( from, msg, true );
}
else if( !Q_strcmp( c, A2A_NETINFO ))
{