Remove old decal system, cl_decals_newsystem has been on by default for 10 years...

[xonotic/darkplaces.git] / palette.c

diff --git a/palette.c b/palette.c
index 8df19dabba2b6eab9b42e0a56b555917a22203f0..4eac82c605ca0d99b099398b9585e555d4d83956 100644 (file)
--- a/palette.c
+++ b/palette.c
@@ -2,7 +2,7 @@
 #include "quakedef.h"
 #include "image.h"
 
-cvar_t r_colormap_palette = {0, "r_colormap_palette", "gfx/colormap_palette.lmp", "name of a palette lmp file to override the shirt/pants colors of player models. It consists of 16 shirt colors, 16 scoreboard shirt colors, 16 pants colors and 16 scoreboard pants colors"};
+cvar_t r_colormap_palette = {CVAR_CLIENT, "r_colormap_palette", "gfx/colormap_palette.lmp", "name of a palette lmp file to override the shirt/pants colors of player models. It consists of 16 shirt colors, 16 scoreboard shirt colors, 16 pants colors and 16 scoreboard pants colors"};
 
 unsigned char palette_rgb[256][3];
 unsigned char palette_rgb_pantscolormap[16][3];
@@ -204,7 +204,8 @@ static void Palette_LoadQ2Colormap(void)
                unsigned char *out = (unsigned char *) q2palette_bgra_complete; // palette is accessed as 32bit for speed reasons, but is created as 8bit bytes
                int i;
                LoadPCX_PaletteOnly(q2colormapfile, filesize, q2palette_rgb[0]);
-               for (i = 0;i < 256;i++)
+               // this stops at color 255 because it is a pink transparent color that we don't actually want to preserve color on.
+               for (i = 0;i < 255;i++)
                {
                        out[i*4+2] = q2palette_rgb[i][0];
                        out[i*4+1] = q2palette_rgb[i][1];