OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

take namespace enum out of namespace and added CheckNumForAnyName and CheckNumForFullNameInFile to clarify the meaning of CheckNumForFullName.

Browse source 
This is to take some renaming noise out of the upcoming refactoring.
This commit is contained in:
Christoph Oelckers 2024-11-24 13:18:46 +01:00
commit 634a646c2d
51 changed files with 118 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/rendering/swrenderer/r_swcolormaps.cpp
View file

@ -346,9 +346,9 @@ void SetDefaultColormap (const char *name)
uint8_t unremap[256];
uint8_t remap[256];
lump = fileSystem.CheckNumForFullName (name, true, FileSys::ns_colormaps);
lump = fileSystem.CheckNumForAnyName (name, ns_colormaps);
if (lump == -1)
lump = fileSystem.CheckNumForName (name, FileSys::ns_global);
lump = fileSystem.CheckNumForName (name, ns_global);
// [RH] If using BUILD's palette, generate the colormap
if (lump == -1 || fileSystem.CheckNumForFullName("palette.dat") >= 0 || fileSystem.CheckNumForFullName("blood.pal") >= 0)