thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

d_main.c: Adjust shaders.pk3 handling per my comments

Browse source
This commit is contained in:
toaster 2023-01-15 14:00:43 +00:00
parent ad50e67ae9
commit 083d3df96f
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/d_main.c
View file

@ -1115,7 +1115,6 @@ static void IdentifyVersion(void)
#define PATCHNAME "MISC_SCRIPTS.pk3" #define PATCHNAME "MISC_SCRIPTS.pk3"
#define UNLOCKNAME "MISC_UNLOCKS.pk3" #define UNLOCKNAME "MISC_UNLOCKS.pk3"
#define MUSICNAME "MISC_MUSIC.PK3" #define MUSICNAME "MISC_MUSIC.PK3"
#define SHADERSNAME "MISC_SHADERS.pk3"
//// ////
#else #else
//// ////
@ -1124,7 +1123,6 @@ static void IdentifyVersion(void)
#define PATCHNAME "scripts.pk3" #define PATCHNAME "scripts.pk3"
#define UNLOCKNAME "unlocks.pk3" #define UNLOCKNAME "unlocks.pk3"
#define MUSICNAME "music.pk3" #define MUSICNAME "music.pk3"
#define SHADERSNAME "shaders.pk3"
//// ////
#endif #endif
//// ////
@ -1142,7 +1140,7 @@ static void IdentifyVersion(void)
#if defined(DEVELOP) && defined(UNLOCKTESTING) #if defined(DEVELOP) && defined(UNLOCKTESTING)
D_AddFile(startupiwads, va(pandf,srb2waddir,UNLOCKNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,UNLOCKNAME));
#endif #endif
D_AddFile(startupiwads, va(pandf,srb2waddir,SHADERSNAME)); D_AddFile(startupiwads, va(pandf,srb2waddir,"shaders.pk3"));
//// ////
#undef TEXTURESNAME #undef TEXTURESNAME
#undef MAPSNAME #undef MAPSNAME
@ -1468,6 +1466,7 @@ void D_SRB2Main(void)
#endif #endif
#endif //ifndef DEVELOP #endif //ifndef DEVELOP
mainwads++; // shaders.pk3
// Do it before P_InitMapData because PNG patch // Do it before P_InitMapData because PNG patch
// conversion sometimes needs the palette // conversion sometimes needs the palette