From ab77416ddc7176f899aa01ddaec6c90fd4b2a323 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sat, 11 Apr 2020 18:58:38 +0200 Subject: [PATCH] - set transparent color 0 in the proper place. --- src/r_data/v_palette.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/r_data/v_palette.cpp b/src/r_data/v_palette.cpp index 9c1d384e2..f290f2a2c 100644 --- a/src/r_data/v_palette.cpp +++ b/src/r_data/v_palette.cpp @@ -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.