diff --git a/src/r_data.c b/src/r_data.c
index d35777664645d99a7d557dc222a52793b3213c31..ebb73cd428260efa174d1dfe2d8514f787a3b001 100644
--- a/src/r_data.c
+++ b/src/r_data.c
@@ -699,174 +699,152 @@ void R_FlushTextureCache(void)
int R_CountTexturesInTEXTURESLump(UINT16 wadNum, UINT16 lumpNum);
void R_ParseTEXTURESLump(UINT16 wadNum, UINT16 lumpNum, INT32 *index);
-//
-// R_LoadTextures
-// Initializes the texture list with the textures from the world map.
-//
-#define TX_START "TX_START"
-#define TX_END "TX_END"
-void R_LoadTextures(void)
+#ifdef WALLFLATS
+static INT32
+Rloadflats (INT32 i, INT32 w)
{
- INT32 i, w;
UINT16 j;
- UINT16 texstart, texend, texturesLumpPos;
- patch_t *patchlump;
- texpatch_t *patch;
+ UINT16 texstart, texend;
texture_t *texture;
+ texpatch_t *patch;
- // Free previous memory before numtextures change.
- if (numtextures)
+ // Yes
+ if (wadfiles[w]->type == RET_PK3)
{
- for (i = 0; i < numtextures; i++)
- {
- Z_Free(textures[i]);
- Z_Free(texturecache[i]);
- }
- Z_Free(texturetranslation);
- Z_Free(textures);
- Z_Free(texflats);
+ texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0);
+ texend = W_CheckNumForFolderEndPK3("flats/", (UINT16)w, texstart);
+ }
+ else
+ {
+ texstart = W_CheckNumForNamePwad("F_START", (UINT16)w, 0);
+ texend = W_CheckNumForNamePwad("F_END", (UINT16)w, texstart);
}
- // Load patches and textures.
-
- // Get the number of textures to check.
- // NOTE: Make SURE the system does not process
- // the markers.
- // This system will allocate memory for all duplicate/patched textures even if it never uses them,
- // but the alternative is to spend a ton of time checking and re-checking all previous entries just to skip any potentially patched textures.
- for (w = 0, numtextures = 0; w < numwadfiles; w++)
+ if (!( texstart == INT16_MAX || texend == INT16_MAX ))
{
- // Count the textures from TEXTURES lumps
- texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
- while (texturesLumpPos != INT16_MAX)
- {
- numtextures += R_CountTexturesInTEXTURESLump((UINT16)w, (UINT16)texturesLumpPos);
- texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
- }
+ texstart++; // Do not count the first marker
- // Count single-patch textures
- if (wadfiles[w]->type == RET_PK3)
- {
- texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
- texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
- }
- else
+ // Work through each lump between the markers in the WAD.
+ for (j = 0; j < (texend - texstart); j++)
{
- texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0);
- texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
- }
+ UINT8 *flatlump;
+ UINT16 wadnum = (UINT16)w;
+ lumpnum_t lumpnum = texstart + j;
+ size_t lumplength;
+ size_t flatsize = 0;
- if (texstart == INT16_MAX || texend == INT16_MAX)
-#ifdef WALLFLATS
- goto countflats;
-#else
- continue;
-#endif
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder
+ continue; // If it is then SKIP IT
+ }
- texstart++; // Do not count the first marker
+ flatlump = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
+ lumplength = W_LumpLengthPwad(wadnum, lumpnum);
- // PK3s have subfolders, so we can't just make a simple sum
- if (wadfiles[w]->type == RET_PK3)
- {
- for (j = texstart; j < texend; j++)
+ switch (lumplength)
{
- if (!W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it
- numtextures++;
+ case 4194304: // 2048x2048 lump
+ flatsize = 2048;
+ break;
+ case 1048576: // 1024x1024 lump
+ flatsize = 1024;
+ break;
+ case 262144:// 512x512 lump
+ flatsize = 512;
+ break;
+ case 65536: // 256x256 lump
+ flatsize = 256;
+ break;
+ case 16384: // 128x128 lump
+ flatsize = 128;
+ break;
+ case 1024: // 32x32 lump
+ flatsize = 32;
+ break;
+ default: // 64x64 lump
+ flatsize = 64;
+ break;
}
- }
- else // Add all the textures between TX_START and TX_END
- {
- numtextures += (UINT32)(texend - texstart);
- }
-
-#ifdef WALLFLATS
-countflats:
- // Count flats
- if (wadfiles[w]->type == RET_PK3)
- {
- texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0);
- texend = W_CheckNumForFolderEndPK3("flats/", (UINT16)w, texstart);
- }
- else
- {
- texstart = W_CheckNumForNamePwad("F_START", (UINT16)w, 0);
- texend = W_CheckNumForNamePwad("F_END", (UINT16)w, texstart);
- }
- if (texstart == INT16_MAX || texend == INT16_MAX)
- continue;
+ //CONS_Printf("\n\"%s\" is a flat, dimensions %d x %d",W_CheckNameForNumPwad((UINT16)w,texstart+j),flatsize,flatsize);
+ texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
- texstart++; // Do not count the first marker
+ // Set texture properties.
+ M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
- // PK3s have subfolders, so we can't just make a simple sum
- if (wadfiles[w]->type == RET_PK3)
- {
- for (j = texstart; j < texend; j++)
+#ifndef NO_PNG_LUMPS
+ if (R_IsLumpPNG((UINT8 *)flatlump, lumplength))
{
- if (!W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it
- numtextures++;
+ INT16 width, height;
+ R_PNGDimensions((UINT8 *)flatlump, &width, &height, lumplength);
+ texture->width = width;
+ texture->height = height;
}
- }
- else // Add all the textures between F_START and F_END
- {
- numtextures += (UINT32)(texend - texstart);
- }
+ else
#endif
- }
+ texture->width = texture->height = flatsize;
- // If no textures found by this point, bomb out
- if (!numtextures)
- I_Error("No textures detected in any WADs!\n");
+ texture->type = TEXTURETYPE_FLAT;
+ texture->patchcount = 1;
+ texture->holes = false;
+ texture->flip = 0;
- // Allocate memory and initialize to 0 for all the textures we are initialising.
- // There are actually 5 buffers allocated in one for convenience.
- textures = Z_Calloc((numtextures * sizeof(void *)) * 5, PU_STATIC, NULL);
- texflats = Z_Calloc((numtextures * sizeof(*texflats)), PU_STATIC, NULL);
+ // Allocate information for the texture's patches.
+ patch = &texture->patches[0];
- // Allocate texture column offset table.
- texturecolumnofs = (void *)((UINT8 *)textures + (numtextures * sizeof(void *)));
- // Allocate texture referencing cache.
- texturecache = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 2));
- // Allocate texture width table.
- texturewidth = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 3));
- // Allocate texture height table.
- textureheight = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 4));
- // Create translation table for global animation.
- texturetranslation = Z_Malloc((numtextures + 1) * sizeof(*texturetranslation), PU_STATIC, NULL);
+ patch->originx = patch->originy = 0;
+ patch->wad = (UINT16)w;
+ patch->lump = texstart + j;
+ patch->flip = 0;
- for (i = 0; i < numtextures; i++)
- texturetranslation[i] = i;
+ Z_Unlock(flatlump);
- for (i = 0, w = 0; w < numwadfiles; w++)
- {
- // Get the lump numbers for the markers in the WAD, if they exist.
- if (wadfiles[w]->type == RET_PK3)
- {
- texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
- texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
- texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
- while (texturesLumpPos != INT16_MAX)
- {
- R_ParseTEXTURESLump(w, texturesLumpPos, &i);
- texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
- }
+ texturewidth[i] = texture->width;
+ textureheight[i] = texture->height << FRACBITS;
+ i++;
}
- else
+ }
+
+ return i;
+}
+#endif/*WALLFLATS*/
+
+#define TX_START "TX_START"
+#define TX_END "TX_END"
+
+static INT32
+Rloadtextures (INT32 i, INT32 w)
+{
+ UINT16 j;
+ UINT16 texstart, texend, texturesLumpPos;
+ texture_t *texture;
+ patch_t *patchlump;
+ texpatch_t *patch;
+
+ // Get the lump numbers for the markers in the WAD, if they exist.
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
+ texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
+ texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
+ while (texturesLumpPos != INT16_MAX)
{
- texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0);
- texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
- texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
- if (texturesLumpPos != INT16_MAX)
- R_ParseTEXTURESLump(w, texturesLumpPos, &i);
+ R_ParseTEXTURESLump(w, texturesLumpPos, &i);
+ texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
}
+ }
+ else
+ {
+ texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0);
+ texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
+ texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
+ if (texturesLumpPos != INT16_MAX)
+ R_ParseTEXTURESLump(w, texturesLumpPos, &i);
+ }
- if (texstart == INT16_MAX || texend == INT16_MAX)
-#ifdef WALLFLATS
- goto checkflats;
-#else
- continue;
-#endif
-
+ if (!( texstart == INT16_MAX || texend == INT16_MAX ))
+ {
texstart++; // Do not count the first marker
// Work through each lump between the markers in the WAD.
@@ -929,10 +907,45 @@ countflats:
textureheight[i] = texture->height << FRACBITS;
i++;
}
+ }
+
+ return i;
+}
+
+//
+// R_LoadTextures
+// Initializes the texture list with the textures from the world map.
+//
+void R_LoadTextures(void)
+{
+ INT32 i, w;
+ UINT16 j;
+ UINT16 texstart, texend, texturesLumpPos;
+
+ // Free previous memory before numtextures change.
+ if (numtextures)
+ {
+ for (i = 0; i < numtextures; i++)
+ {
+ Z_Free(textures[i]);
+ Z_Free(texturecache[i]);
+ }
+ Z_Free(texturetranslation);
+ Z_Free(textures);
+ Z_Free(texflats);
+ }
+ // Load patches and textures.
+
+ // Get the number of textures to check.
+ // NOTE: Make SURE the system does not process
+ // the markers.
+ // This system will allocate memory for all duplicate/patched textures even if it never uses them,
+ // but the alternative is to spend a ton of time checking and re-checking all previous entries just to skip any potentially patched textures.
+ for (w = 0, numtextures = 0; w < numwadfiles; w++)
+ {
#ifdef WALLFLATS
-checkflats:
- // Yes
+ // Count flats
if (wadfiles[w]->type == RET_PK3)
{
texstart = W_CheckNumForFolderStartPK3("flats/", (UINT16)w, 0);
@@ -944,91 +957,94 @@ checkflats:
texend = W_CheckNumForNamePwad("F_END", (UINT16)w, texstart);
}
- if (texstart == INT16_MAX || texend == INT16_MAX)
- continue;
-
- texstart++; // Do not count the first marker
-
- // Work through each lump between the markers in the WAD.
- for (j = 0; j < (texend - texstart); j++)
+ if (!( texstart == INT16_MAX || texend == INT16_MAX ))
{
- UINT8 *flatlump;
- UINT16 wadnum = (UINT16)w;
- lumpnum_t lumpnum = texstart + j;
- size_t lumplength;
- size_t flatsize = 0;
+ texstart++; // Do not count the first marker
+ // PK3s have subfolders, so we can't just make a simple sum
if (wadfiles[w]->type == RET_PK3)
{
- if (W_IsLumpFolder(wadnum, lumpnum)) // Check if lump is a folder
- continue; // If it is then SKIP IT
+ for (j = texstart; j < texend; j++)
+ {
+ if (!W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it
+ numtextures++;
+ }
}
-
- flatlump = W_CacheLumpNumPwad(wadnum, lumpnum, PU_CACHE);
- lumplength = W_LumpLengthPwad(wadnum, lumpnum);
-
- switch (lumplength)
+ else // Add all the textures between F_START and F_END
{
- case 4194304: // 2048x2048 lump
- flatsize = 2048;
- break;
- case 1048576: // 1024x1024 lump
- flatsize = 1024;
- break;
- case 262144:// 512x512 lump
- flatsize = 512;
- break;
- case 65536: // 256x256 lump
- flatsize = 256;
- break;
- case 16384: // 128x128 lump
- flatsize = 128;
- break;
- case 1024: // 32x32 lump
- flatsize = 32;
- break;
- default: // 64x64 lump
- flatsize = 64;
- break;
+ numtextures += (UINT32)(texend - texstart);
}
+ }
+#endif/*WALLFLATS*/
- //CONS_Printf("\n\"%s\" is a flat, dimensions %d x %d",W_CheckNameForNumPwad((UINT16)w,texstart+j),flatsize,flatsize);
- texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
+ // Count the textures from TEXTURES lumps
+ texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, 0);
+ while (texturesLumpPos != INT16_MAX)
+ {
+ numtextures += R_CountTexturesInTEXTURESLump((UINT16)w, (UINT16)texturesLumpPos);
+ texturesLumpPos = W_CheckNumForNamePwad("TEXTURES", (UINT16)w, texturesLumpPos + 1);
+ }
- // Set texture properties.
- M_Memcpy(texture->name, W_CheckNameForNumPwad(wadnum, lumpnum), sizeof(texture->name));
+ // Count single-patch textures
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ texstart = W_CheckNumForFolderStartPK3("textures/", (UINT16)w, 0);
+ texend = W_CheckNumForFolderEndPK3("textures/", (UINT16)w, texstart);
+ }
+ else
+ {
+ texstart = W_CheckNumForNamePwad(TX_START, (UINT16)w, 0);
+ texend = W_CheckNumForNamePwad(TX_END, (UINT16)w, 0);
+ }
-#ifndef NO_PNG_LUMPS
- if (R_IsLumpPNG((UINT8 *)flatlump, lumplength))
+ if (texstart == INT16_MAX || texend == INT16_MAX)
+ continue;
+
+ texstart++; // Do not count the first marker
+
+ // PK3s have subfolders, so we can't just make a simple sum
+ if (wadfiles[w]->type == RET_PK3)
+ {
+ for (j = texstart; j < texend; j++)
{
- INT16 width, height;
- R_PNGDimensions((UINT8 *)flatlump, &width, &height, lumplength);
- texture->width = width;
- texture->height = height;
+ if (!W_IsLumpFolder((UINT16)w, j)) // Check if lump is a folder; if not, then count it
+ numtextures++;
}
- else
-#endif
- texture->width = texture->height = flatsize;
+ }
+ else // Add all the textures between TX_START and TX_END
+ {
+ numtextures += (UINT32)(texend - texstart);
+ }
+ }
- texture->type = TEXTURETYPE_FLAT;
- texture->patchcount = 1;
- texture->holes = false;
- texture->flip = 0;
+ // If no textures found by this point, bomb out
+ if (!numtextures)
+ I_Error("No textures detected in any WADs!\n");
- // Allocate information for the texture's patches.
- patch = &texture->patches[0];
+ // Allocate memory and initialize to 0 for all the textures we are initialising.
+ // There are actually 5 buffers allocated in one for convenience.
+ textures = Z_Calloc((numtextures * sizeof(void *)) * 5, PU_STATIC, NULL);
+ texflats = Z_Calloc((numtextures * sizeof(*texflats)), PU_STATIC, NULL);
- patch->originx = patch->originy = 0;
- patch->wad = (UINT16)w;
- patch->lump = texstart + j;
- patch->flip = 0;
+ // Allocate texture column offset table.
+ texturecolumnofs = (void *)((UINT8 *)textures + (numtextures * sizeof(void *)));
+ // Allocate texture referencing cache.
+ texturecache = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 2));
+ // Allocate texture width table.
+ texturewidth = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 3));
+ // Allocate texture height table.
+ textureheight = (void *)((UINT8 *)textures + ((numtextures * sizeof(void *)) * 4));
+ // Create translation table for global animation.
+ texturetranslation = Z_Malloc((numtextures + 1) * sizeof(*texturetranslation), PU_STATIC, NULL);
- Z_Unlock(flatlump);
+ for (i = 0; i < numtextures; i++)
+ texturetranslation[i] = i;
- texturewidth[i] = texture->width;
- textureheight[i] = texture->height << FRACBITS;
- i++;
- }
+ for (i = 0, w = 0; w < numwadfiles; w++)
+ {
+ i = Rloadtextures(i, w);
+#ifdef WALLFLATS
+ i = Rloadflats(i, w);
#endif
}