From 78bc4fdac958c62a7839a67960b051ec5f4f90ff Mon Sep 17 00:00:00 2001 From: toaster Date: Sat, 24 Dec 2022 16:21:24 +0000 Subject: [PATCH] Further changes in anticipation of potential future TESTER builds. * Create a seperate `unlocks.pk3` so we can customise what the testers have. * Make TESTERS(/HOSTTESTERS) builds have their own default gamedata. --- src/d_main.c | 4 +++- src/g_game.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/d_main.c b/src/d_main.c index 8ba822e21..7b0d2a4f6 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -1125,6 +1125,7 @@ static void IdentifyVersion(void) #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 @@ -1132,6 +1133,7 @@ static void IdentifyVersion(void) #define TEXTURESNAME "textures.pk3" #define MAPSNAME "maps.pk3" #define PATCHNAME "scripts.pk3" +#define UNLOCKNAME "unlocks.pk3" #define MUSICNAME "music.pk3" //// #endif @@ -1148,7 +1150,7 @@ static void IdentifyVersion(void) #endif #define UNLOCKTESTING #if defined(DEVELOP) && defined(UNLOCKTESTING) - D_AddFile(startupiwads, va(pandf,srb2waddir,"unlocks.pk3")); + D_AddFile(startupiwads, va(pandf,srb2waddir,UNLOCKNAME)); #endif //// #undef TEXTURESNAME diff --git a/src/g_game.c b/src/g_game.c index fb49b598c..a79dd5219 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -77,7 +77,9 @@ JoyType_t Joystick[MAXSPLITSCREENPLAYERS]; // SRB2kart char gamedatafilename[64] = -#ifdef DEVELOP +#if defined (TESTERS) || defined (HOSTTESTERS) + "test" +#elif defined(DEVELOP) "develop" #endif "ringdata.dat";