From 1f62f35477a0070b95d81500cabf6159fad11861 Mon Sep 17 00:00:00 2001 From: kreatordxx <> Date: Tue, 30 Mar 2010 03:37:29 +0000 Subject: [PATCH] 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 --- CHANGELOG.txt | 4 ++++ main/titles.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 5a1d8c3b1..5faa18cf5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,9 @@ D2X-Rebirth Changelog +20100330 +-------- +main/titles.c: For Descent 1 briefings, only change the palette to groupa.256 for brief03.pcx - the robot screen. Improves palette use for sdl build + 20100328 -------- main/lighting.c: For casting light from Player-object, smooth out thrust to prevent flickering on high FPS diff --git a/main/titles.c b/main/titles.c index fe3c45cb7..a32c89a08 100644 --- a/main/titles.c +++ b/main/titles.c @@ -1158,7 +1158,7 @@ int load_briefing_screen(briefing *br, char *fname) show_fullscr(&br->background); - if (EMULATING_D1) // HACK, FIXME: D1 missions should use their own palette (PALETTE.256), but texture replacements not complete + if (EMULATING_D1 && !stricmp(fname, "brief03.pcx")) // HACK, FIXME: D1 missions should use their own palette (PALETTE.256), but texture replacements not complete gr_use_palette_table("groupa.256"); gr_palette_load(gr_palette);