AnarchistGamers/woof
1
0
Fork 0
mirror of https://github.com/fabiangreffrath/woof.git synced 2025-09-23 03:52:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

simplify invalid patch check on a per-patch base (instead of per-texture)

Browse Source 
Also, improve PNG signature check, thanks @kraflab!
This commit is contained in:
Fabian Greffrath 2023-05-17 07:49:54 +02:00
parent 046a4bb83c
commit 17bc0fb2c5
1 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/r_data.c
View File

@ -299,29 +299,6 @@ static void R_GenerateComposite(int texnum)
Z_ChangeTag(block2, PU_CACHE); Z_ChangeTag(block2, PU_CACHE);
} }
// [FG] detect invalid patches, substitute dummy patch
static void R_SubstInvalidPatches (int texnum)
{
texture_t *texture = textures[texnum];
texpatch_t *patch = texture->patches;
int i = texture->patchcount;
while (--i >= 0)
{
int pat = patch[i].patch;
if (!R_IsPatchLump(pat))
{
fprintf(stderr, "\nR_SubstInvalidPatches: Texture %d '%.8s'"
" patch %d '%.8s' is invalid",
texnum, texture->name, i, lumpinfo[pat].name);
patch[i].patch = (W_CheckNumForName)("TNT1A0", ns_sprites);
}
}
}
// //
// R_GenerateLookup // R_GenerateLookup
// //
@ -578,6 +555,13 @@ void R_InitTextures (void)
if (patchlookup[i] == -1 && devparm) // killough 8/8/98 if (patchlookup[i] == -1 && devparm) // killough 8/8/98
printf("\nWarning: patch %.8s, index %d does not exist",name,i); printf("\nWarning: patch %.8s, index %d does not exist",name,i);
} }
if (patchlookup[i] == -1 || !R_IsPatchLump(patchlookup[i]))
{
fprintf(stderr, "\nR_InitTextures: patch %.8s, index %d is invalid", name, i);
patchlookup[i] = (W_CheckNumForName)("TNT1A0", ns_sprites);
}
} }
Z_Free(names); Z_Free(names);
@ -730,9 +714,6 @@ void R_InitTextures (void)
if (errors) if (errors)
I_Error("\n\n%d errors.", errors); I_Error("\n\n%d errors.", errors);
for (i = 0; i < numtextures; i++)
R_SubstInvalidPatches(i);
// Precalculate whatever possible. // Precalculate whatever possible.
for (i=0 ; i<numtextures ; i++) for (i=0 ; i<numtextures ; i++)
R_GenerateLookup(i, &errors); R_GenerateLookup(i, &errors);