X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=palette.h;h=8658f128442514be1083dc22715235bfcb88c998;hp=4a8fc0a305f113c285a57cc230dcd55c919c9231;hb=6c526650ca4c8150e53214dab39104f2065765cf;hpb=95e297494d5fd6b4431720b350980b913a52ad9c

diff --git a/palette.h b/palette.h
index 4a8fc0a3..8658f128 100644
--- a/palette.h
+++ b/palette.h
@@ -2,24 +2,40 @@
 #ifndef PALLETE_H
 #define PALLETE_H
 
-extern unsigned int palette_complete[256];
-extern unsigned int palette_font[256];
-extern unsigned int palette_alpha[256];
-extern unsigned int palette_nocolormap[256];
-extern unsigned int palette_nocolormapnofullbrights[256];
-extern unsigned int palette_nofullbrights[256];
-extern unsigned int palette_onlyfullbrights[256];
-extern unsigned int palette_pantsaswhite[256];
-extern unsigned int palette_shirtaswhite[256];
-extern unsigned int palette_transparent[256];
-extern unsigned int palette_pantscolormap[16];
-extern unsigned int palette_shirtcolormap[16];
-extern unsigned int palette_pantsscoreboard[16];
-extern unsigned int palette_shirtscoreboard[16];
+#define PALETTEFEATURE_STANDARD 1
+#define PALETTEFEATURE_REVERSED 2
+#define PALETTEFEATURE_PANTS 4
+#define PALETTEFEATURE_SHIRT 8
+#define PALETTEFEATURE_GLOW 16
+#define PALETTEFEATURE_ZERO 32
+#define PALETTEFEATURE_TRANSPARENT 128
+
+extern unsigned char palette_rgb[256][3];
+extern unsigned char palette_rgb_pantscolormap[16][3];
+extern unsigned char palette_rgb_shirtcolormap[16][3];
+extern unsigned char palette_rgb_pantsscoreboard[16][3];
+extern unsigned char palette_rgb_shirtscoreboard[16][3];
+
+extern unsigned int palette_bgra_complete[256];
+extern unsigned int palette_bgra_font[256];
+extern unsigned int palette_bgra_alpha[256];
+extern unsigned int palette_bgra_nocolormap[256];
+extern unsigned int palette_bgra_nocolormapnofullbrights[256];
+extern unsigned int palette_bgra_nofullbrights[256];
+extern unsigned int palette_bgra_nofullbrights_transparent[256];
+extern unsigned int palette_bgra_onlyfullbrights[256];
+extern unsigned int palette_bgra_onlyfullbrights_transparent[256];
+extern unsigned int palette_bgra_pantsaswhite[256];
+extern unsigned int palette_bgra_shirtaswhite[256];
+extern unsigned int palette_bgra_transparent[256];
+extern unsigned int palette_bgra_embeddedpic[256];
+extern unsigned char palette_featureflags[256];
+
+extern unsigned int q2palette_bgra_complete[256];
 
 // used by hardware gamma functions in vid_* files
-void BuildGammaTable8(float prescale, float gamma, float scale, float base, unsigned char *out, int rampsize);
-void BuildGammaTable16(float prescale, float gamma, float scale, float base, unsigned short *out, int rampsize);
+void BuildGammaTable8(float prescale, float gamma, float scale, float base, float contrastboost, unsigned char *out, int rampsize);
+void BuildGammaTable16(float prescale, float gamma, float scale, float base, float contrastboost, unsigned short *out, int rampsize);
 
 void Palette_Init(void);