stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-16 09:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '45922f80d1e35aadc9da6e20fa32fa78c1044dfd' into flats-png

Browse source
This commit is contained in:
Alam Ed Arias 2019-07-24 18:17:01 -04:00
commit 0eb6b24415
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/r_data.c
View file

@ -1160,6 +1160,15 @@ void R_ReInitColormaps(UINT16 num)
lump = W_GetNumForName(colormap); lump = W_GetNumForName(colormap);
if (lump == LUMPERROR) if (lump == LUMPERROR)
lump = W_GetNumForName("COLORMAP"); lump = W_GetNumForName("COLORMAP");
else
{
if (W_LumpLength(lump) > W_LumpLength(W_GetNumForName("COLORMAP")))
{
CONS_Alert(CONS_WARNING, "%s lump size is too big, using COLORMAP.\n", colormap);
lump = W_GetNumForName("COLORMAP");
}
}
W_ReadLump(lump, colormaps); W_ReadLump(lump, colormaps);
// Init Boom colormaps. // Init Boom colormaps.