From 4d2793918c5aa8e9aec5529db33b13ddcd153a04 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 2 Jan 2022 21:58:18 -0800 Subject: [PATCH 01/12] Disable player admins --- src/d_netcmd.c | 14 -------------- src/d_netcmd.h | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 7fa504e90..151dea858 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -3560,20 +3560,6 @@ static void Command_Login_f(void) #endif } -boolean IsPlayerAdmin(INT32 playernum) -{ -#ifdef DEVELOP - return playernum != serverplayer; -#else - INT32 i; - for (i = 0; i < MAXPLAYERS; i++) - if (playernum == adminplayers[i]) - return true; - - return false; -#endif -} - void SetAdminPlayer(INT32 playernum) { INT32 i; diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 0e8ef25e2..6e8f58b39 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -217,7 +217,7 @@ void D_SetupVote(void); void D_ModifyClientVote(UINT8 player, SINT8 voted, UINT8 splitplayer); void D_PickVote(void); void ObjectPlace_OnChange(void); -boolean IsPlayerAdmin(INT32 playernum); +#define IsPlayerAdmin(playernum) (0) void SetAdminPlayer(INT32 playernum); void ClearAdminPlayers(void); void RemoveAdminPlayer(INT32 playernum); From 5d6595f8a0bc726fa54783970b259e968cc18dac Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 2 Jan 2022 22:08:18 -0800 Subject: [PATCH 02/12] Load misc build testers data files --- src/d_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 20f73ea69..0c071252c 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1066,9 +1066,9 @@ static void IdentifyVersion(void) // checking in D_SRB2Main D_AddFile(startupiwads, va(pandf,srb2waddir,"gfx.pk3")); - D_AddFile(startupiwads, va(pandf,srb2waddir,"textures.pk3")); + D_AddFile(startupiwads, va(pandf,srb2waddir,"MISC_TEXTURES.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"chars.pk3")); - D_AddFile(startupiwads, va(pandf,srb2waddir,"maps.pk3")); + D_AddFile(startupiwads, va(pandf,srb2waddir,"MISC_MAPS.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"followers.pk3")); #ifdef USE_PATCH_FILE D_AddFile(startupiwads, va(pandf,srb2waddir,"patch.pk3")); @@ -1087,7 +1087,7 @@ static void IdentifyVersion(void) } MUSICTEST("sounds.pk3") - MUSICTEST("music.pk3") + MUSICTEST("MISC_MUSIC.pk3") #undef MUSICTEST From 250dc70827fdc8b4bef090984bb1c4529687b1f9 Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 17 Jan 2022 01:12:30 +0000 Subject: [PATCH 03/12] TESTERS stuff #define TESTERS for tester executable #define HOSTTESTERS for hosting with TESTERS-specific files (MISC_ etc) --- src/d_main.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 0c071252c..94ee87983 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1065,14 +1065,32 @@ static void IdentifyVersion(void) // if you change the ordering of this or add/remove a file, be sure to update the md5 // checking in D_SRB2Main +#if defined (TESTERS) || defined (HOSTTESTERS) +//// +#define TEXTURESNAME "MISC_TEXTURES.pk3" +#define MAPSNAME "MISC_MAPS.pk3" +#define PATCHNAME "MISC_PATCH.pk3" +//// +#else +//// +#define TEXTURESNAME "textures.pk3" +#define MAPSNAME "maps.pk3" +#define PATCHNAME "patch.pk3" +//// +#endif +//// D_AddFile(startupiwads, va(pandf,srb2waddir,"gfx.pk3")); - D_AddFile(startupiwads, va(pandf,srb2waddir,"MISC_TEXTURES.pk3")); + D_AddFile(startupiwads, va(pandf,srb2waddir,TEXTURESNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,"chars.pk3")); - D_AddFile(startupiwads, va(pandf,srb2waddir,"MISC_MAPS.pk3")); + D_AddFile(startupiwads, va(pandf,srb2waddir,MAPSNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,"followers.pk3")); #ifdef USE_PATCH_FILE - D_AddFile(startupiwads, va(pandf,srb2waddir,"patch.pk3")); + D_AddFile(startupiwads, va(pandf,srb2waddir,PATCHNAME)); #endif +//// +#undef TEXTURESNAME +#undef MAPSNAME +#undef PATCHNAME #if !defined (HAVE_SDL) || defined (HAVE_MIXER) From 6980975f1129eb727978e2fd2d16e542e51f0573 Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 17 Jan 2022 01:19:13 +0000 Subject: [PATCH 04/12] Revert "Disable player admins" This reverts commit 4d2793918c5aa8e9aec5529db33b13ddcd153a04. --- src/d_netcmd.c | 14 ++++++++++++++ src/d_netcmd.h | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 151dea858..7fa504e90 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -3560,6 +3560,20 @@ static void Command_Login_f(void) #endif } +boolean IsPlayerAdmin(INT32 playernum) +{ +#ifdef DEVELOP + return playernum != serverplayer; +#else + INT32 i; + for (i = 0; i < MAXPLAYERS; i++) + if (playernum == adminplayers[i]) + return true; + + return false; +#endif +} + void SetAdminPlayer(INT32 playernum) { INT32 i; diff --git a/src/d_netcmd.h b/src/d_netcmd.h index 6e8f58b39..0e8ef25e2 100644 --- a/src/d_netcmd.h +++ b/src/d_netcmd.h @@ -217,7 +217,7 @@ void D_SetupVote(void); void D_ModifyClientVote(UINT8 player, SINT8 voted, UINT8 splitplayer); void D_PickVote(void); void ObjectPlace_OnChange(void); -#define IsPlayerAdmin(playernum) (0) +boolean IsPlayerAdmin(INT32 playernum); void SetAdminPlayer(INT32 playernum); void ClearAdminPlayers(void); void RemoveAdminPlayer(INT32 playernum); From 4cff27797c27ec58188b7492f355094ff07e954c Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 17 Jan 2022 01:22:10 +0000 Subject: [PATCH 05/12] Guard IsPlayerAdmin in testers/hosttesters --- src/d_netcmd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 7fa504e90..9aeb4126b 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -3562,7 +3562,9 @@ static void Command_Login_f(void) boolean IsPlayerAdmin(INT32 playernum) { -#ifdef DEVELOP +#if defined (TESTERS) || defined (HOSTTESTERS) + return false; +#elif defined (DEVELOP) return playernum != serverplayer; #else INT32 i; From 4d4ea71a44f2fbc19c056f3f393f63fa47374a8a Mon Sep 17 00:00:00 2001 From: toaster Date: Mon, 17 Jan 2022 01:23:14 +0000 Subject: [PATCH 06/12] Music also --- src/d_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/d_main.c b/src/d_main.c index 94ee87983..c60072638 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1070,12 +1070,14 @@ static void IdentifyVersion(void) #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 //// @@ -1105,8 +1107,9 @@ static void IdentifyVersion(void) } MUSICTEST("sounds.pk3") - MUSICTEST("MISC_MUSIC.pk3") + MUSICTEST(MUSICNAME) +#undef MUSICNAME #undef MUSICTEST #endif From 5441c55baf671f7b359726ba093b49bdda482712 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 16 Jan 2022 17:32:58 -0800 Subject: [PATCH 07/12] Do not add gfx.pk3 in testers build MISC_PATCH.pk3 covers it. --- src/d_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/d_main.c b/src/d_main.c index c60072638..bce68c0ef 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1081,7 +1081,9 @@ static void IdentifyVersion(void) //// #endif //// +#if !defined (TESTERS) && !defined (HOSTTESTERS) D_AddFile(startupiwads, va(pandf,srb2waddir,"gfx.pk3")); +#endif D_AddFile(startupiwads, va(pandf,srb2waddir,TEXTURESNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,"chars.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,MAPSNAME)); From c860427026f19b481b2f374ffb705e0e1126ddc8 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 16 Jan 2022 17:34:12 -0800 Subject: [PATCH 08/12] Add HOSTTESTERS make flag --- src/Makefile.d/features.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk index a29a8a153..c9a81fcfa 100644 --- a/src/Makefile.d/features.mk +++ b/src/Makefile.d/features.mk @@ -6,7 +6,7 @@ passthru_opts+=\ NONET NO_IPV6 NOHW NOMD5 NOPOSTPROCESSING\ MOBJCONSISTANCY PACKETDROP ZDEBUG\ HAVE_MINIUPNPC\ - HAVE_DISCORDRPC TESTERS DEVELOP + HAVE_DISCORDRPC TESTERS HOSTTESTERS DEVELOP # build with debugging information ifdef DEBUGMODE From 7e709cd018808f4fa8be4389a6a0e1126d5923a5 Mon Sep 17 00:00:00 2001 From: James R Date: Sun, 16 Jan 2022 17:35:47 -0800 Subject: [PATCH 09/12] Fix compiler warning --- src/d_netcmd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/d_netcmd.c b/src/d_netcmd.c index 9aeb4126b..8765b4d99 100644 --- a/src/d_netcmd.c +++ b/src/d_netcmd.c @@ -3563,6 +3563,7 @@ static void Command_Login_f(void) boolean IsPlayerAdmin(INT32 playernum) { #if defined (TESTERS) || defined (HOSTTESTERS) + (void)playernum; return false; #elif defined (DEVELOP) return playernum != serverplayer; From ba6ee7eaa0fcca5b9e1382c75f79410902574cf6 Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 19 Jan 2022 01:13:09 -0800 Subject: [PATCH 10/12] Do not count gfx.pk3 toward mainwads in testers build --- src/d_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/d_main.c b/src/d_main.c index bce68c0ef..2532448fe 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1348,7 +1348,9 @@ void D_SRB2Main(void) mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_PK3); // patch.pk3 #endif #else +#if !defined (TESTERS) || !defined (HOSTTESTERS) mainwads++; // gfx.pk3 +#endif mainwads++; // textures.pk3 mainwads++; // chars.pk3 mainwads++; // maps.pk3 From 8f8d34728b99f140a7cc4fbff5eb402ff52d563e Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 19 Jan 2022 01:17:12 -0800 Subject: [PATCH 11/12] JUST SEARCH ALL FUCKING WADS --- src/d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_main.c b/src/d_main.c index 2532448fe..c35bcf5c6 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1364,7 +1364,7 @@ void D_SRB2Main(void) // // search for maps // - for (wadnum = 4; wadnum < 6; wadnum++) // fucking arbitrary numbers + for (wadnum = 0; wadnum <= mainwads; wadnum++) { lumpinfo = wadfiles[wadnum]->lumpinfo; for (i = 0; i < wadfiles[wadnum]->numlumps; i++, lumpinfo++) From b3e6030a9bf8a722eaaef0e5f0472c1e45cf3d09 Mon Sep 17 00:00:00 2001 From: James R Date: Wed, 19 Jan 2022 01:17:54 -0800 Subject: [PATCH 12/12] Wrong condition --- src/d_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_main.c b/src/d_main.c index c35bcf5c6..db56f174f 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1348,7 +1348,7 @@ void D_SRB2Main(void) mainwads++; W_VerifyFileMD5(mainwads, ASSET_HASH_PATCH_PK3); // patch.pk3 #endif #else -#if !defined (TESTERS) || !defined (HOSTTESTERS) +#if !defined (TESTERS) && !defined (HOSTTESTERS) mainwads++; // gfx.pk3 #endif mainwads++; // textures.pk3