lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into next 

# Conflicts:
#	src/r_data.c
This commit is contained in:
Monster Iestyn 2019-06-28 23:24:36 +01:00
parent 2c906e9c29 016f1fe533
commit 3a9ce483f5
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/r_data.c
View File

@ -506,42 +506,30 @@ void R_LoadTextures(void)
} }
patchlump = W_CacheLumpNumPwad((UINT16)w, texstart + j, PU_CACHE); patchlump = W_CacheLumpNumPwad((UINT16)w, texstart + j, PU_CACHE);
// Then, check the lump directly to see if it's a texture SOC, //CONS_Printf("\n\"%s\" is a single patch, dimensions %d x %d",W_CheckNameForNumPwad((UINT16)w,texstart+j),patchlump->width, patchlump->height);
// and if it is, load it using dehacked instead. texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
if (strstr((const char *)patchlump, "TEXTURE"))
{
CONS_Alert(CONS_WARNING, "%s is a Texture SOC.\n", W_CheckNameForNumPwad((UINT16)w,texstart+j));
Z_Unlock(patchlump);
DEH_LoadDehackedLumpPwad((UINT16)w, texstart + j);
}
else
{
//CONS_Printf("\n\"%s\" is a single patch, dimensions %d x %d",W_CheckNameForNumPwad((UINT16)w,texstart+j),patchlump->width, patchlump->height);
texture = textures[i] = Z_Calloc(sizeof(texture_t) + sizeof(texpatch_t), PU_STATIC, NULL);
// Set texture properties. // Set texture properties.
M_Memcpy(texture->name, W_CheckNameForNumPwad((UINT16)w, texstart + j), sizeof(texture->name)); M_Memcpy(texture->name, W_CheckNameForNumPwad((UINT16)w, texstart + j), sizeof(texture->name));
texture->width = SHORT(patchlump->width); texture->width = SHORT(patchlump->width);
texture->height = SHORT(patchlump->height); texture->height = SHORT(patchlump->height);
texture->patchcount = 1; texture->patchcount = 1;
texture->holes = false; texture->holes = false;
// Allocate information for the texture's patches. // Allocate information for the texture's patches.
patch = &texture->patches[0]; patch = &texture->patches[0];
patch->originx = patch->originy = 0; patch->originx = patch->originy = 0;
patch->wad = (UINT16)w; patch->wad = (UINT16)w;
patch->lump = texstart + j; patch->lump = texstart + j;
Z_Unlock(patchlump); Z_Unlock(patchlump);
k = 1; k = 1;
while (k << 1 <= texture->width) while (k << 1 <= texture->width)
k <<= 1; k <<= 1;
texturewidthmask[i] = k - 1;
texturewidthmask[i] = k - 1; textureheight[i] = texture->height << FRACBITS;
textureheight[i] = texture->height << FRACBITS;
}
i++; i++;
} }
} }
@ -1088,6 +1076,7 @@ void R_ReInitColormaps(UINT16 num)
{ {
char colormap[9] = "COLORMAP"; char colormap[9] = "COLORMAP";
lumpnum_t lump; lumpnum_t lump;
const lumpnum_t basecolormaplump = W_GetNumForName(colormap);
if (num > 0 && num <= 10000) if (num > 0 && num <= 10000)
snprintf(colormap, 8, "CLM%04u", num-1); snprintf(colormap, 8, "CLM%04u", num-1);
@ -1095,8 +1084,16 @@ void R_ReInitColormaps(UINT16 num)
// Load in the light tables, now 64k aligned for smokie... // Load in the light tables, now 64k aligned for smokie...
lump = W_GetNumForName(colormap); lump = W_GetNumForName(colormap);
if (lump == LUMPERROR) if (lump == LUMPERROR)
lump = W_GetNumForName("COLORMAP"); lump = basecolormaplump;
W_ReadLump(lump, colormaps); else
{
if (W_LumpLength(lump) != W_LumpLength(basecolormaplump))
{
CONS_Alert(CONS_WARNING, "%s lump size does not match COLORMAP, results may be unexpected.\n", colormap);
}
}
W_ReadLumpHeader(lump, colormaps, W_LumpLength(basecolormaplump), 0U);
// Init Boom colormaps. // Init Boom colormaps.
R_ClearColormaps(); R_ClearColormaps();

12
src/w_wad.c
View File

@ -149,9 +149,15 @@ FILE *W_OpenWadFile(const char **filename, boolean useerrors)
{ {
FILE *handle; FILE *handle;
strncpy(filenamebuf, *filename, MAX_WADPATH); // Officially, strncpy should not have overlapping buffers, since W_VerifyNMUSlumps is called after this, and it
filenamebuf[MAX_WADPATH - 1] = '\0'; // changes filename to point at filenamebuf, it would technically be doing that. I doubt any issue will occur since
*filename = filenamebuf; // they point to the same location, but it's better to be safe and this is a simple change.
if (filenamebuf != *filename)
{
strncpy(filenamebuf, *filename, MAX_WADPATH);
filenamebuf[MAX_WADPATH - 1] = '\0';
*filename = filenamebuf;
}
// open wad file // open wad file
if ((handle = fopen(*filename, "rb")) == NULL) if ((handle = fopen(*filename, "rb")) == NULL)