zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- set transparent color 0 in the proper place.

This commit is contained in:
Christoph Oelckers 2020-04-11 18:58:38 +02:00
parent 1ed170d955
commit ab77416ddc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/r_data/v_palette.cpp
View File

@ -157,7 +157,7 @@ void InitPalette ()
ReadPalette(fileSystem.GetNumForName("PLAYPAL"), pal);
GPalette.Init(NUM_TRANSLATION_TABLES);
GPalette.SetPalette (pal, 0);
GPalette.SetPalette (pal, -1);
int lump = fileSystem.CheckNumForName("COLORMAP");
if (lump == -1) lump = fileSystem.CheckNumForName("COLORMAP", ns_colormaps);
@ -178,6 +178,7 @@ void InitPalette ()
GPalette.Remap[0] = BestColor ((uint32_t *)GPalette.BaseColors,
GPalette.BaseColors[0].r, GPalette.BaseColors[0].g, GPalette.BaseColors[0].b, 1, 255);
}
GPalette.BaseColors[0] = 0;
// Colormaps have to be initialized before actors are loaded,
// otherwise Powerup.Colormap will not work.