thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-19 22:42:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Readd version and subversion to serverinfo

Browse source 
Add commit field after those two so packet is identical up
to that point and DEVELOP builds mismatch version online.

blame d176aefd8
This commit is contained in:
James R 2022-09-30 05:49:26 -07:00
parent d176aefd88
commit bc0fc9b05a
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/d_clisrv.c
View file

@ -896,12 +896,12 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
netbuffer->u.serverinfo._255 = 255;
netbuffer->u.serverinfo.packetversion = PACKETVERSION;
netbuffer->u.serverinfo.version = VERSION;
netbuffer->u.serverinfo.subversion = SUBVERSION;
#ifdef DEVELOP
memcpy(netbuffer->u.serverinfo.commit,
comprevision_abbrev_bin, GIT_SHA_ABBREV);
#else
netbuffer->u.serverinfo.version = VERSION;
netbuffer->u.serverinfo.subversion = SUBVERSION;
#endif
strncpy(netbuffer->u.serverinfo.application, SRB2APPLICATION,
@ -1411,13 +1411,11 @@ static void SL_InsertServer(serverinfo_pak* info, SINT8 node)
if (info->packetversion != PACKETVERSION)
return;/* old new packet format */
#ifndef DEVELOP
if (info->version != VERSION)
return; // Not same version.
if (info->subversion != SUBVERSION)
return; // Close, but no cigar.
#endif
if (strcmp(info->application, SRB2APPLICATION))
return;/* that's a different mod */
@ -2052,10 +2050,8 @@ static void CL_ConnectToServer(void)
gametypestr[sizeof serverlist[i].info.gametypename - 1] = '\0';
CON_LogMessage(va(M_GetText("Gametype: %s\n"), gametypestr));
#ifndef DEVELOP
CON_LogMessage(va(M_GetText("Version: %d.%d\n"),
serverlist[i].info.version, serverlist[i].info.subversion));
#endif
}
SL_ClearServerList(servernode);

5
src/d_clisrv.h
View file

@ -266,11 +266,10 @@ typedef struct
UINT8 _255;
UINT8 packetversion;
char application[MAXAPPLICATION];
#ifdef DEVELOP
UINT8 commit[GIT_SHA_ABBREV];
#else
UINT8 version;
UINT8 subversion;
#ifdef DEVELOP
UINT8 commit[GIT_SHA_ABBREV];
#endif
UINT8 numberofplayer;
UINT8 maxplayer;