zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-30 15:52:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

- ZDoom no longer errors if no precalculated COLORMAP is found.

Browse source 
SVN r3662 (trunk)
This commit is contained in:
Braden Obrzut 2012-05-18 02:30:07 +00:00
parent 7356350d5c
commit e62e806693
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/r_data/colormaps.cpp
View file

@ -396,8 +396,12 @@ void R_SetDefaultColormap (const char *name)
BYTE unremap[256]; BYTE unremap[256];
BYTE remap[256]; BYTE remap[256];
lump = Wads.CheckNumForName (name, ns_colormaps);
if (lump == -1)
lump = Wads.CheckNumForName (name, ns_global);
// [RH] If using BUILD's palette, generate the colormap // [RH] If using BUILD's palette, generate the colormap
if (Wads.CheckNumForFullName("palette.dat") >= 0 || Wads.CheckNumForFullName("blood.pal") >= 0) if (lump == -1 || Wads.CheckNumForFullName("palette.dat") >= 0 || Wads.CheckNumForFullName("blood.pal") >= 0)
{ {
Printf ("Make colormap\n"); Printf ("Make colormap\n");
FDynamicColormap foo; FDynamicColormap foo;
@ -411,9 +415,6 @@ void R_SetDefaultColormap (const char *name)
} }
else else
{ {
lump = Wads.CheckNumForName (name, ns_colormaps);
if (lump == -1)
lump = Wads.CheckNumForName (name, ns_global);
FWadLump lumpr = Wads.OpenLumpNum (lump); FWadLump lumpr = Wads.OpenLumpNum (lump);
// [RH] The colormap may not have been designed for the specific // [RH] The colormap may not have been designed for the specific