lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made PCX use cv_screenshot_colorprofile. 

Also, optimised gif headwrite's palette writing.
This commit is contained in:
toasterbabe 2017-04-21 20:29:06 +01:00
parent aa475c9d26
commit 3cce495675
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/m_anigif.c
View File

@ -439,11 +439,9 @@ static void GIF_headwrite(void)
else else
{ {
const UINT8 *pal = (UINT8 *)W_CacheLumpName(GetPalette(), PU_CACHE); const UINT8 *pal = (UINT8 *)W_CacheLumpName(GetPalette(), PU_CACHE);
for (i = 0; i < 256; i++) for (i = 0; i < 256*3; i++)
{ {
WRITEUINT8(p, *pal); pal++; WRITEUINT8(p, *pal); pal++;
WRITEUINT8(p, *pal); pal++;
WRITEUINT8(p, *pal); pal++;
} }
} }

26
src/m_misc.c
View File

@ -1342,7 +1342,7 @@ typedef struct
* \param palette Palette of image data * \param palette Palette of image data
*/ */
#if NUMSCREENS > 2 #if NUMSCREENS > 2
static boolean WritePCXfile(const char *filename, const UINT8 *data, int width, int height, const UINT8 *palette) static boolean WritePCXfile(const char *filename, const UINT8 *data, int width, int height)
{ {
int i; int i;
size_t length; size_t length;
@ -1383,8 +1383,25 @@ static boolean WritePCXfile(const char *filename, const UINT8 *data, int width,
// write the palette // write the palette
*pack++ = 0x0c; // palette ID byte *pack++ = 0x0c; // palette ID byte
for (i = 0; i < 768; i++)
*pack++ = *palette++; // write color table
if (cv_screenshot_colorprofile.value)
{
for (i = 0; i < 256; i++)
{
*pack++ = pLocalPalette[i].s.red;
*pack++ = pLocalPalette[i].s.green;
*pack++ = pLocalPalette[i].s.blue;
}
}
else
{
const UINT8 *pal = (UINT8 *)W_CacheLumpName(GetPalette(), PU_CACHE);
for (i = 0; i < 256*3; i++)
{
*pack++ = *pal++;
}
}
// write output file // write output file
length = pack - (UINT8 *)pcx; length = pack - (UINT8 *)pcx;
@ -1460,8 +1477,7 @@ void M_DoScreenShot(void)
#ifdef USE_PNG #ifdef USE_PNG
ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, true); ret = M_SavePNG(va(pandf,pathname,freename), linear, vid.width, vid.height, true);
#else #else
ret = WritePCXfile(va(pandf,pathname,freename), linear, vid.width, vid.height, ret = WritePCXfile(va(pandf,pathname,freename), linear, vid.width, vid.height);
W_CacheLumpName(GetPalette(), PU_CACHE));
#endif #endif
} }