X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=palette.c;h=7b6fb8d6bbc0b9bfb86e5b59bed5d7288731a5e6;hb=f85803e7bc2d0612763bdb8548c7060ddb542afb;hp=af4131469d45cacdfb616ca9c5849e06db1f085f;hpb=ac26fe8251232ec2eb02c89b9df3d07444063211;p=xonotic%2Fdarkplaces.git

diff --git a/palette.c b/palette.c
index af413146..7b6fb8d6 100644
--- a/palette.c
+++ b/palette.c
@@ -1,5 +1,6 @@
 
 #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"};
 
@@ -22,6 +23,8 @@ unsigned int palette_bgra_transparent[256];
 unsigned int palette_bgra_embeddedpic[256];
 unsigned char palette_featureflags[256];
 
+unsigned int q2palette_bgra_complete[256];
+
 // John Carmack said the quake palette.lmp can be considered public domain because it is not an important asset to id, so I include it here as a fallback if no external palette file is found.
 unsigned char host_quakepal[768] =
 {
@@ -76,7 +79,7 @@ unsigned char host_quakepal[768] =
 	139,0,0,      179,0,0,      215,0,0,      255,0,0,      255,243,147,  255,247,199,  255,255,255,  159,91,83
 }; //                                                    15 ^
 
-void Palette_SetupSpecialPalettes(void)
+static void Palette_SetupSpecialPalettes(void)
 {
 	int i;
 	int fullbright_start, fullbright_end;
@@ -183,6 +186,27 @@ void Palette_SetupSpecialPalettes(void)
 	palette_bgra_font[0] = 0;
 }
 
+static void Palette_LoadQ2Colormap(void)
+{
+	fs_offset_t filesize;
+	unsigned char * q2colormapfile = FS_LoadFile("pics/colormap.pcx", tempmempool, true, &filesize);
+	if (q2colormapfile && filesize >= 768)
+	{
+		unsigned char q2palette_rgb[256][3];
+		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++)
+		{
+			out[i*4+2] = q2palette_rgb[i][0];
+			out[i*4+1] = q2palette_rgb[i][1];
+			out[i*4+0] = q2palette_rgb[i][2];
+			out[i*4+3] = 255;
+		}
+		Mem_Free(q2colormapfile);
+	}
+}
+
 void BuildGammaTable8(float prescale, float gamma, float scale, float base, float contrastboost, unsigned char *out, int rampsize)
 {
 	int i, adjusted;
@@ -221,15 +245,15 @@ void BuildGammaTable16(float prescale, float gamma, float scale, float base, flo
 	}
 }
 
-void Palette_Shutdown(void)
+static void Palette_Shutdown(void)
 {
 }
 
-void Palette_NewMap(void)
+static void Palette_NewMap(void)
 {
 }
 
-void Palette_Load(void)
+static void Palette_Load(void)
 {
 	int i;
 	unsigned char *out;
@@ -326,6 +350,8 @@ void Palette_Load(void)
 	}
 
 	Palette_SetupSpecialPalettes();
+
+	Palette_LoadQ2Colormap();
 }
 
 void Palette_Init(void)