cl_main: Fix double free of meshentities texture pool when running gamedir

[xonotic/darkplaces.git] / palette.c

diff --git a/palette.c b/palette.c
index 5b8743423eb53201554ecd4d3e7141a6a560bca9..eac0ca345294c7643cf57a567b39852e421b3a57 100644 (file)
--- a/palette.c
+++ b/palette.c
@@ -2,7 +2,7 @@
 #include "quakedef.h"
 #include "image.h"
 
-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"};
+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];
@@ -281,15 +281,15 @@ 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(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(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(sys.argv[i + 1]);
        gamma = bound(0.01, gamma, 10.0);