From 35cce1a4df2a5409d84b1a0a4f2ee7ecf68497a0 Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Wed, 10 Jun 2015 15:55:15 -0400 Subject: [PATCH 1/2] Fixed black caption bar being green --- src/interface/widget.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/interface/widget.c b/src/interface/widget.c index 1cef750f43..8e0c5ca83b 100644 --- a/src/interface/widget.c +++ b/src/interface/widget.c @@ -657,7 +657,12 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge press |= 0x80; gfx_fill_rect_inset(dpi, l, t, r, b, colour, press); - gfx_fill_rect(dpi, l + 1, t + 1, r - 1, b - 1, 0x2000000 | 47); + + // Black caption bars look slightly green, this fixes that + if (colour == 0) + gfx_fill_rect(dpi, l + 1, t + 1, r - 1, b - 1, *((char*)(0x0141FC47 + (colour * 8)))); + else + gfx_fill_rect(dpi, l + 1, t + 1, r - 1, b - 1, 0x2000000 | 47); } // Draw text From 029f7cf664b6c6f63fc04d19fb898ac3916a54dc Mon Sep 17 00:00:00 2001 From: Robert Jordan Date: Wed, 10 Jun 2015 16:13:32 -0400 Subject: [PATCH 2/2] One colour off --- src/interface/widget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/interface/widget.c b/src/interface/widget.c index 8e0c5ca83b..a86eb07866 100644 --- a/src/interface/widget.c +++ b/src/interface/widget.c @@ -660,7 +660,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge // Black caption bars look slightly green, this fixes that if (colour == 0) - gfx_fill_rect(dpi, l + 1, t + 1, r - 1, b - 1, *((char*)(0x0141FC47 + (colour * 8)))); + gfx_fill_rect(dpi, l + 1, t + 1, r - 1, b - 1, *((char*)(0x0141FC46 + (colour * 8)))); else gfx_fill_rect(dpi, l + 1, t + 1, r - 1, b - 1, 0x2000000 | 47); }