thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'testers' into 'master'

Browse source 
Allow TESTERS builds to be made for any branch

See merge request KartKrew/Kart!529
This commit is contained in:
toaster 2022-01-23 22:48:48 +00:00
commit 4b1cef0f20
3 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Makefile.d/features.mk
View file

@ -6,7 +6,7 @@ passthru_opts+=\
NONET NO_IPV6 NOHW NOMD5 NOPOSTPROCESSING\ NONET NO_IPV6 NOHW NOMD5 NOPOSTPROCESSING\
MOBJCONSISTANCY PACKETDROP ZDEBUG\ MOBJCONSISTANCY PACKETDROP ZDEBUG\
HAVE_MINIUPNPC\ HAVE_MINIUPNPC\
HAVE_DISCORDRPC TESTERS DEVELOP HAVE_DISCORDRPC TESTERS HOSTTESTERS DEVELOP
# build with debugging information # build with debugging information
ifdef DEBUGMODE ifdef DEBUGMODE

35
src/d_main.c
View file

@ -1080,14 +1080,36 @@ static void IdentifyVersion(void)
// if you change the ordering of this or add/remove a file, be sure to update the md5 // if you change the ordering of this or add/remove a file, be sure to update the md5
// checking in D_SRB2Main // checking in D_SRB2Main
#if defined (TESTERS) || defined (HOSTTESTERS)
////
#define TEXTURESNAME "MISC_TEXTURES.pk3"
#define MAPSNAME "MISC_MAPS.pk3"
#define PATCHNAME "MISC_PATCH.pk3"
#define MUSICNAME "MISC_MUSIC.PK3"
////
#else
////
#define TEXTURESNAME "textures.pk3"
#define MAPSNAME "maps.pk3"
#define PATCHNAME "patch.pk3"
#define MUSICNAME "music.pk3"
////
#endif
////
#if !defined (TESTERS) && !defined (HOSTTESTERS)
D_AddFile(startupiwads, va(pandf,srb2waddir,"gfx.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"gfx.pk3"));
D_AddFile(startupiwads, va(pandf,srb2waddir,"textures.pk3")); #endif
D_AddFile(startupiwads, va(pandf,srb2waddir,TEXTURESNAME));
D_AddFile(startupiwads, va(pandf,srb2waddir,"chars.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"chars.pk3"));
D_AddFile(startupiwads, va(pandf,srb2waddir,"maps.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,MAPSNAME));
D_AddFile(startupiwads, va(pandf,srb2waddir,"followers.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"followers.pk3"));
#ifdef USE_PATCH_FILE #ifdef USE_PATCH_FILE
D_AddFile(startupiwads, va(pandf,srb2waddir,"patch.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,PATCHNAME));
#endif #endif
////
#undef TEXTURESNAME
#undef MAPSNAME
#undef PATCHNAME
#if !defined (HAVE_SDL) || defined (HAVE_MIXER) #if !defined (HAVE_SDL) || defined (HAVE_MIXER)
@ -1102,8 +1124,9 @@ static void IdentifyVersion(void)
} }
MUSICTEST("sounds.pk3") MUSICTEST("sounds.pk3")
MUSICTEST("music.pk3") MUSICTEST(MUSICNAME)
#undef MUSICNAME
#undef MUSICTEST #undef MUSICTEST
#endif #endif
@ -1340,7 +1363,9 @@ void D_SRB2Main(void)
mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_PK3); // patch.pk3 mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_PK3); // patch.pk3
#endif #endif
#else #else
#if !defined (TESTERS) && !defined (HOSTTESTERS)
mainwads++; // gfx.pk3 mainwads++; // gfx.pk3
#endif
mainwads++; // textures.pk3 mainwads++; // textures.pk3
mainwads++; // chars.pk3 mainwads++; // chars.pk3
mainwads++; // maps.pk3 mainwads++; // maps.pk3
@ -1354,7 +1379,7 @@ void D_SRB2Main(void)
// //
// search for maps // search for maps
// //
for (wadnum = 4; wadnum < 6; wadnum++) // fucking arbitrary numbers for (wadnum = 0; wadnum <= mainwads; wadnum++)
{ {
lumpinfo = wadfiles[wadnum]->lumpinfo; lumpinfo = wadfiles[wadnum]->lumpinfo;
for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++) for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++)

5
src/d_netcmd.c
View file

@ -3582,7 +3582,10 @@ static void Command_Login_f(void)
boolean IsPlayerAdmin(INT32 playernum) boolean IsPlayerAdmin(INT32 playernum)
{ {
#ifdef DEVELOP #if defined (TESTERS) || defined (HOSTTESTERS)
(void)playernum;
return false;
#elif defined (DEVELOP)
return playernum != serverplayer; return playernum != serverplayer;
#else #else
INT32 i; INT32 i;