zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-10 23:02:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

- set transparent color 0 in the proper place.

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