thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-19 12:01:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'commit-in-all-builds' into 'master'

Browse source 
Keep PT_SERVERINFO struct the same in all builds

See merge request KartKrew/Kart!2233
This commit is contained in:
James R. 2024-04-06 00:00:30 +00:00
commit 17b267035c
4 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/d_clisrv.c
View file

@ -1018,10 +1018,8 @@ static void SV_SendServerInfo(INT32 node, tic_t servertime)
netbuffer->u.serverinfo.version = VERSION;
netbuffer->u.serverinfo.subversion = SUBVERSION;
#ifdef DEVELOP
memcpy(netbuffer->u.serverinfo.commit,
comprevision_abbrev_bin, GIT_SHA_ABBREV);
#endif
strncpy(netbuffer->u.serverinfo.application, SRB2APPLICATION,
sizeof netbuffer->u.serverinfo.application);

2
src/d_clisrv.h
View file

@ -298,9 +298,7 @@ struct serverinfo_pak
char application[MAXAPPLICATION];
UINT8 version;
UINT8 subversion;
#ifdef DEVELOP
UINT8 commit[GIT_SHA_ABBREV];
#endif
UINT8 numberofplayer;
UINT8 maxplayer;
UINT8 refusereason; // 0: joinable, 1: joins disabled, 2: full

7
src/d_main.cpp
View file

@ -127,9 +127,7 @@ extern "C" consvar_t cv_lua_profile, cv_menuframeskip;
int VERSION;
int SUBVERSION;
#ifdef DEVELOP
UINT8 comprevision_abbrev_bin[GIT_SHA_ABBREV];
#endif
#ifdef HAVE_DISCORDRPC
#include "discord.h"
@ -1412,7 +1410,6 @@ static void IdentifyVersion(void)
#undef MUSICTEST
}
#ifdef DEVELOP
static void
D_AbbrevCommit (void)
{
@ -1424,7 +1421,6 @@ D_AbbrevCommit (void)
&comprevision_abbrev_bin[i]);
}
}
#endif
static void
D_ConvertVersionNumbers (void)
@ -1478,10 +1474,7 @@ void D_SRB2Main(void)
/* break the version string into version numbers, for netplay */
D_ConvertVersionNumbers();
#ifdef DEVELOP
D_AbbrevCommit();
#endif
// Print GPL notice for our console users (Linux)
CONS_Printf(

2
src/doomdef.h
View file

@ -514,7 +514,6 @@ char *sizeu5(size_t num);
extern int VERSION;
extern int SUBVERSION;
#ifdef DEVELOP
// 4 bytes handles 8 characters of a git object SHA. At
// around 20k commits, we only need 6 characters for a unique
// abbreviation. Maybe in another 20k commits, more than 8
@ -522,7 +521,6 @@ extern int SUBVERSION;
// P.S. 8 is also what comptime generates
#define GIT_SHA_ABBREV (4)
extern UINT8 comprevision_abbrev_bin[GIT_SHA_ABBREV];
#endif
extern boolean devparm; // development mode (-debug)