D1X: Fix black and white swapping when viewing robots in briefings using Mac data; D2X: For Descent 1 briefings, only change the palette to groupa.256 for brief03.pcx - the robot screen. Improves palette use for sdl build

This commit is contained in:
kreatordxx 2010-03-30 03:37:29 +00:00
parent ee6324b3e4
commit 00d1d41439
2 changed files with 15 additions and 0 deletions

View file

@ -1,5 +1,9 @@
D1X-Rebirth Changelog
20100330
--------
main/titles.c: Fix black and white swapping when viewing robots in briefings using Mac data
20100328
--------
main/lighting.c: For casting light from Player-object, smooth out thrust to prevent flickering on high FPS

View file

@ -944,6 +944,7 @@ void bald_guy_cheat(int key)
}
void free_briefing_screen(briefing *br);
extern void swap_0_255(grs_bitmap *bmp);
// loads a briefing screen
int load_briefing_screen(briefing *br, char *fname)
@ -962,6 +963,16 @@ int load_briefing_screen(briefing *br, char *fname)
if ((pcx_error = pcx_read_bitmap(fname, &br->background, BM_LINEAR, gr_palette))!=PCX_ERROR_NONE)
Error( "Error loading briefing screen <%s>, PCX load error: %s (%i)\n",fname, pcx_errormsg(pcx_error), pcx_error);
// Hack: Make sure black parts of robot are shown black
if (MacPig && gr_palette[0] == 63 &&
(!stricmp(fname, "brief03.pcx") ||
!stricmp(fname, "end01.pcx")))
{
swap_0_255(&br->background);
gr_palette[0] = gr_palette[1] = gr_palette[2] = 0;
gr_palette[765] = gr_palette[766] = gr_palette[767] = 63;
}
show_fullscr(&br->background);