cvar: Remove unused ignore_callback variable

[xonotic/darkplaces.git] / palette.c

diff --git a/palette.c b/palette.c
index 7b6fb8d6bbc0b9bfb86e5b59bed5d7288731a5e6..eac0ca345294c7643cf57a567b39852e421b3a57 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 = {CF_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];
@@ -16,7 +16,9 @@ unsigned int palette_bgra_alpha[256];
 unsigned int palette_bgra_nocolormap[256];
 unsigned int palette_bgra_nocolormapnofullbrights[256];
 unsigned int palette_bgra_nofullbrights[256];
+unsigned int palette_bgra_nofullbrights_transparent[256];
 unsigned int palette_bgra_onlyfullbrights[256];
+unsigned int palette_bgra_onlyfullbrights_transparent[256];
 unsigned int palette_bgra_pantsaswhite[256];
 unsigned int palette_bgra_shirtaswhite[256];
 unsigned int palette_bgra_transparent[256];
@@ -133,11 +135,17 @@ static void Palette_SetupSpecialPalettes(void)
                palette_bgra_nofullbrights[i] = palette_bgra_complete[i];
        for (i = fullbright_start;i < fullbright_end;i++)
                palette_bgra_nofullbrights[i] = palette_bgra_complete[0];
+       for (i = 0;i < 256;i++)
+               palette_bgra_nofullbrights_transparent[i] = palette_bgra_nofullbrights[i];
+       palette_bgra_nofullbrights_transparent[transparentcolor] = 0;
 
        for (i = 0;i < 256;i++)
                palette_bgra_onlyfullbrights[i] = 0;
        for (i = fullbright_start;i < fullbright_end;i++)
                palette_bgra_onlyfullbrights[i] = palette_bgra_complete[i];
+       for (i = 0;i < 256;i++)
+               palette_bgra_onlyfullbrights_transparent[i] = palette_bgra_onlyfullbrights[i];
+       palette_bgra_onlyfullbrights_transparent[transparentcolor] = 0;
 
        for (i = 0;i < 256;i++)
                palette_bgra_nocolormapnofullbrights[i] = palette_bgra_complete[i];
@@ -196,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];
@@ -272,17 +281,17 @@ static void Palette_Load(void)
        scale = 1;
        base = 0;
 // COMMANDLINEOPTION: Client: -texgamma <number> sets the quake palette gamma, allowing you to make quake textures brighter/darker, not recommended
-       i = COM_CheckParm("-texgamma");
+       i = Sys_CheckParm("-texgamma");
        if (i)
-               gamma = atof(com_argv[i + 1]);
+               gamma = atof(sys.argv[i + 1]);
 // COMMANDLINEOPTION: Client: -texcontrast <number> sets the quake palette contrast, allowing you to make quake textures brighter/darker, not recommended
-       i = COM_CheckParm("-texcontrast");
+       i = Sys_CheckParm("-texcontrast");
        if (i)
-               scale = atof(com_argv[i + 1]);
+               scale = atof(sys.argv[i + 1]);
 // COMMANDLINEOPTION: Client: -texbrightness <number> sets the quake palette brightness (brightness of black), allowing you to make quake textures brighter/darker, not recommended
-       i = COM_CheckParm("-texbrightness");
+       i = Sys_CheckParm("-texbrightness");
        if (i)
-               base = atof(com_argv[i + 1]);
+               base = atof(sys.argv[i + 1]);
        gamma = bound(0.01, gamma, 10.0);
        scale = bound(0.01, scale, 10.0);
        base = bound(0, base, 0.95);