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 'tester-rip' into 'master'

Browse source 
Tester build asset changes

See merge request KartKrew/Kart!930
This commit is contained in:
James R 2023-02-17 02:18:13 +00:00
commit 5b561815d7
1 changed files with 6 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/d_main.c
View file

@ -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 // 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_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 #ifdef USE_PATCH_FILE
D_AddFile(startupiwads, va(pandf,srb2waddir,PATCHNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,"scripts.pk3"));
#endif #endif
#if !defined (TESTERS) && !defined (HOSTTESTERS)
D_AddFile(startupiwads, va(pandf,srb2waddir,"gfx.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"gfx.pk3"));
#endif D_AddFile(startupiwads, va(pandf,srb2waddir,"textures.pk3"));
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,MAPSNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,"maps.pk3"));
D_AddFile(startupiwads, va(pandf,srb2waddir,"followers.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"followers.pk3"));
#define UNLOCKTESTING #define UNLOCKTESTING
#if defined(DEVELOP) && defined(UNLOCKTESTING) #if defined(DEVELOP) && defined(UNLOCKTESTING)
D_AddFile(startupiwads, va(pandf,srb2waddir,UNLOCKNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,"unlocks.pk3"));
#endif #endif
D_AddFile(startupiwads, va(pandf,srb2waddir,"shaders.pk3")); D_AddFile(startupiwads, va(pandf,srb2waddir,"shaders.pk3"));
////
#undef TEXTURESNAME
#undef MAPSNAME
#undef PATCHNAME
#if !defined (HAVE_SDL) || defined (HAVE_MIXER) #if !defined (HAVE_SDL) || defined (HAVE_MIXER)
@ -1154,9 +1131,8 @@ static void IdentifyVersion(void)
} }
MUSICTEST("sounds.pk3") MUSICTEST("sounds.pk3")
MUSICTEST(MUSICNAME) MUSICTEST("music.pk3")
#undef MUSICNAME
#undef MUSICTEST #undef MUSICTEST
#endif #endif
@ -1459,9 +1435,7 @@ void D_SRB2Main(void)
#ifdef USE_PATCH_FILE #ifdef USE_PATCH_FILE
mainwads++; // scripts.pk3 mainwads++; // scripts.pk3
#endif #endif
#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