From 61a745b4e3a1713a19c6c4e7503e096396f7f41c Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Fri, 17 Feb 2023 00:23:45 +0000
Subject: [PATCH] Tester build asset changes

We are now using base assets for tester builds
---
 src/d_main.c | 38 ++++++--------------------------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index 38c16bc39..484a07c11 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1103,43 +1103,20 @@ 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_SCRIPTS.pk3"
-#define UNLOCKNAME "MISC_UNLOCKS.pk3"
-#define MUSICNAME "MISC_MUSIC.PK3"
-////
-#else
-////
-#define TEXTURESNAME "textures.pk3"
-#define MAPSNAME "maps.pk3"
-#define PATCHNAME "scripts.pk3"
-#define UNLOCKNAME "unlocks.pk3"
-#define MUSICNAME "music.pk3"
-////
-#endif
-////
+
 #ifdef USE_PATCH_FILE
-	D_AddFile(startupiwads, va(pandf,srb2waddir,PATCHNAME));
+	D_AddFile(startupiwads, va(pandf,srb2waddir,"scripts.pk3"));
 #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,"textures.pk3"));
 	D_AddFile(startupiwads, va(pandf,srb2waddir,"chars.pk3"));
-	D_AddFile(startupiwads, va(pandf,srb2waddir,MAPSNAME));
+	D_AddFile(startupiwads, va(pandf,srb2waddir,"maps.pk3"));
 	D_AddFile(startupiwads, va(pandf,srb2waddir,"followers.pk3"));
 #define UNLOCKTESTING
 #if defined(DEVELOP) && defined(UNLOCKTESTING)
-	D_AddFile(startupiwads, va(pandf,srb2waddir,UNLOCKNAME));
+	D_AddFile(startupiwads, va(pandf,srb2waddir,"unlocks.pk3"));
 #endif
 	D_AddFile(startupiwads, va(pandf,srb2waddir,"shaders.pk3"));
-////
-#undef TEXTURESNAME
-#undef MAPSNAME
-#undef PATCHNAME
 
 #if !defined (HAVE_SDL) || defined (HAVE_MIXER)
 
@@ -1154,9 +1131,8 @@ static void IdentifyVersion(void)
 	}
 
 	MUSICTEST("sounds.pk3")
-	MUSICTEST(MUSICNAME)
+	MUSICTEST("music.pk3")
 
-#undef MUSICNAME
 #undef MUSICTEST
 
 #endif
@@ -1448,9 +1424,7 @@ void D_SRB2Main(void)
 #ifdef USE_PATCH_FILE
 	mainwads++;	// scripts.pk3
 #endif
-#if !defined (TESTERS) && !defined (HOSTTESTERS)
 	mainwads++;	// gfx.pk3
-#endif
 	mainwads++;	// textures.pk3
 	mainwads++;	// chars.pk3
 	mainwads++;	// maps.pk3