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

Fix RVFXANIM

Browse source 
- P_InitPicAnims: Parse RVFXANIM *before* ANIMDEFS in same archive
- P_ParseANIMDEFSLump: Account for comment and blank lines so not repeatedly re-evaluating the same line
This commit is contained in:
toaster 2025-09-02 17:19:29 +01:00
parent 952fb622b7
commit 4d19faf600
2 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_setup.cpp
View file

@ -9785,6 +9785,8 @@ void P_ReduceVFXTextureReload(void)
extern "C" void ReduceVFX_OnChange(void); extern "C" void ReduceVFX_OnChange(void);
void ReduceVFX_OnChange(void) void ReduceVFX_OnChange(void)
{ {
if (con_startup_loadprogress < LOADED_CONFIG)
return;
P_ReduceVFXTextureReload(); P_ReduceVFXTextureReload();
} }

35
src/p_spec.c
View file

@ -180,7 +180,18 @@ void P_InitPicAnims(void)
for (w = numwadfiles-1; w >= 0; w--) for (w = numwadfiles-1; w >= 0; w--)
{ {
UINT16 animdefsLumpNum; UINT16 animdefsLumpNum;
UINT16 photosensLumpNum;
if (cv_reducevfx.value)
{
// Find RVFXANIM lump in the WAD *first*
animdefsLumpNum = W_CheckNumForNamePwad("RVFXANIM", w, 0);
while (animdefsLumpNum != INT16_MAX)
{
P_ParseANIMDEFSLump(w, animdefsLumpNum, true);
animdefsLumpNum = W_CheckNumForNamePwad("RVFXANIM", (UINT16)w, animdefsLumpNum + 1);
}
}
// Find ANIMDEFS lump in the WAD // Find ANIMDEFS lump in the WAD
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", w, 0); animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", w, 0);
@ -190,18 +201,6 @@ void P_InitPicAnims(void)
P_ParseANIMDEFSLump(w, animdefsLumpNum, false); P_ParseANIMDEFSLump(w, animdefsLumpNum, false);
animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", (UINT16)w, animdefsLumpNum + 1); animdefsLumpNum = W_CheckNumForNamePwad("ANIMDEFS", (UINT16)w, animdefsLumpNum + 1);
} }
if (cv_reducevfx.value)
{
// Find RVFXANIM lump in the WAD
photosensLumpNum = W_CheckNumForNamePwad("RVFXANIM", w, 0);
while (photosensLumpNum != INT16_MAX)
{
P_ParseANIMDEFSLump(w, photosensLumpNum, true);
photosensLumpNum = W_CheckNumForNamePwad("RVFXANIM", (UINT16)w, photosensLumpNum + 1);
}
}
} }
// Define the last one // Define the last one
@ -299,9 +298,13 @@ void P_ParseANIMDEFSLump(INT32 wadNum, UINT16 lumpnum, boolean photosens)
{ {
I_Error("Error parsing ANIMDEFS lump: Expected \"TEXTURE\", got \"%s\"",animdefsToken); I_Error("Error parsing ANIMDEFS lump: Expected \"TEXTURE\", got \"%s\"",animdefsToken);
} }
// parse next line
while (*p != '\0' && *p != '\n') ++p; do // get next content line to parse
if (*p == '\n') ++p; {
while (*p != '\0' && *p != '\n') ++p; // skips content of evaluated line
while (*p == '\n') ++p; // skips extra blank lines
} while (*p == '/' && *(p+1) == '/'); // skips comments
animdefsToken = M_GetToken(p); animdefsToken = M_GetToken(p);
} }
Z_Free(animdefsToken); Z_Free(animdefsToken);