1
0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 19:13:07 +01:00

Integrate data at 0x009DEDF4

This commit is contained in:
Marijn van der Werf
2016-08-21 14:24:55 +02:00
parent 5a03c6b129
commit bdb04e3da3
5 changed files with 240 additions and 5 deletions

View File

@@ -130,6 +130,240 @@ const uint16 palette_to_g1_offset[PALETTE_TO_G1_OFFSET_COUNT] = {
0x13B4, 0x13B5, 0x13B6, 0x13B7,
};
/** rct2: 0x009DEDF4 */
const uint8 _9DEDF4[] = {
0, // COLOUR_BLACK
0, // COLOUR_GREY
0, // COLOUR_WHITE
0, // COLOUR_DARK_PURPLE
0, // COLOUR_LIGHT_PURPLE
0, // COLOUR_BRIGHT_PURPLE
0, // COLOUR_DARK_BLUE
0, // COLOUR_LIGHT_BLUE
0, // COLOUR_ICY_BLUE
0, // COLOUR_TEAL
0, // COLOUR_AQUAMARINE
0, // COLOUR_SATURATED_GREEN
0, // COLOUR_DARK_GREEN
0, // COLOUR_MOSS_GREEN
0, // COLOUR_BRIGHT_GREEN
0, // COLOUR_OLIVE_GREEN
0, // COLOUR_DARK_OLIVE_GREEN
0, // COLOUR_BRIGHT_YELLOW
0, // COLOUR_YELLOW
0, // COLOUR_DARK_YELLOW
0, // COLOUR_LIGHT_ORANGE
0, // COLOUR_DARK_ORANGE
0, // COLOUR_LIGHT_BROWN
0, // COLOUR_SATURATED_BROWN
0, // COLOUR_DARK_BROWN
0, // COLOUR_SALMON_PINK
0, // COLOUR_BORDEAUX_RED
0, // COLOUR_SATURATED_RED
0, // COLOUR_BRIGHT_RED
0, // COLOUR_DARK_PINK
0, // COLOUR_BRIGHT_PINK
0, // COLOUR_LIGHT_PINK
0, // COLOUR_BLACK | COLOUR_FLAG_OUTLINE
0, // COLOUR_GREY | COLOUR_FLAG_OUTLINE
0, // COLOUR_WHITE | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_PURPLE | COLOUR_FLAG_OUTLINE
0, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_OUTLINE
0, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_BLUE | COLOUR_FLAG_OUTLINE
0, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_OUTLINE
0, // COLOUR_ICY_BLUE | COLOUR_FLAG_OUTLINE
0, // COLOUR_TEAL | COLOUR_FLAG_OUTLINE
0, // COLOUR_AQUAMARINE | COLOUR_FLAG_OUTLINE
0, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_MOSS_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_OUTLINE
0, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_OUTLINE
0, // COLOUR_YELLOW | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_YELLOW | COLOUR_FLAG_OUTLINE
0, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE
0, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_OUTLINE
0, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_BROWN | COLOUR_FLAG_OUTLINE
0, // COLOUR_SALMON_PINK | COLOUR_FLAG_OUTLINE
0, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_OUTLINE
0, // COLOUR_SATURATED_RED | COLOUR_FLAG_OUTLINE
0, // COLOUR_BRIGHT_RED | COLOUR_FLAG_OUTLINE
0, // COLOUR_DARK_PINK | COLOUR_FLAG_OUTLINE
0, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_OUTLINE
0, // COLOUR_LIGHT_PINK | COLOUR_FLAG_OUTLINE
0, // COLOUR_BLACK | COLOUR_FLAG_INSET
0, // COLOUR_GREY | COLOUR_FLAG_INSET
0, // COLOUR_WHITE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_PURPLE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_BLUE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_INSET
0, // COLOUR_ICY_BLUE | COLOUR_FLAG_INSET
0, // COLOUR_TEAL | COLOUR_FLAG_INSET
0, // COLOUR_AQUAMARINE | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_DARK_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_MOSS_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_INSET
0, // COLOUR_YELLOW | COLOUR_FLAG_INSET
0, // COLOUR_DARK_YELLOW | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_ORANGE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_INSET
0, // COLOUR_DARK_BROWN | COLOUR_FLAG_INSET
0, // COLOUR_SALMON_PINK | COLOUR_FLAG_INSET
0, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_RED | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_RED | COLOUR_FLAG_INSET
0, // COLOUR_DARK_PINK | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_PINK | COLOUR_FLAG_INSET
0, // COLOUR_BLACK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_GREY | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_WHITE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_ICY_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_TEAL | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_AQUAMARINE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_MOSS_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_SALMON_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_SATURATED_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_DARK_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0, // COLOUR_LIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET
0x34, // COLOUR_BLACK | COLOUR_FLAG_TRANSLUCENT
0x34, // COLOUR_GREY | COLOUR_FLAG_TRANSLUCENT
0x6D, // COLOUR_WHITE | COLOUR_FLAG_TRANSLUCENT
0x40, // COLOUR_DARK_PURPLE | COLOUR_FLAG_TRANSLUCENT
0x40, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_TRANSLUCENT
0x58, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_TRANSLUCENT
0x37, // COLOUR_DARK_BLUE | COLOUR_FLAG_TRANSLUCENT
0x37, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_TRANSLUCENT
0x37, // COLOUR_ICY_BLUE | COLOUR_FLAG_TRANSLUCENT
0x61, // COLOUR_TEAL | COLOUR_FLAG_TRANSLUCENT
0x61, // COLOUR_AQUAMARINE | COLOUR_FLAG_TRANSLUCENT
0x52, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_TRANSLUCENT
0x3D, // COLOUR_DARK_GREEN | COLOUR_FLAG_TRANSLUCENT
0x4C, // COLOUR_MOSS_GREEN | COLOUR_FLAG_TRANSLUCENT
0x52, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_TRANSLUCENT
0x4F, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_TRANSLUCENT
0x43, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_TRANSLUCENT
0x49, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_TRANSLUCENT
0x49, // COLOUR_YELLOW | COLOUR_FLAG_TRANSLUCENT
0x49, // COLOUR_DARK_YELLOW | COLOUR_FLAG_TRANSLUCENT
0x5E, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_TRANSLUCENT
0x5E, // COLOUR_DARK_ORANGE | COLOUR_FLAG_TRANSLUCENT
0x46, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_TRANSLUCENT
0x46, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_TRANSLUCENT
0x67, // COLOUR_DARK_BROWN | COLOUR_FLAG_TRANSLUCENT
0x55, // COLOUR_SALMON_PINK | COLOUR_FLAG_TRANSLUCENT
0x3A, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_TRANSLUCENT
0x5B, // COLOUR_SATURATED_RED | COLOUR_FLAG_TRANSLUCENT
0x5B, // COLOUR_BRIGHT_RED | COLOUR_FLAG_TRANSLUCENT
0x64, // COLOUR_DARK_PINK | COLOUR_FLAG_TRANSLUCENT
0x64, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_TRANSLUCENT
0x6A, // COLOUR_LIGHT_PINK | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BLACK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_GREY | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_WHITE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_ICY_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_TEAL | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_AQUAMARINE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_MOSS_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SALMON_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_LIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BLACK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_GREY | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_WHITE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_PURPLE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_BLUE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_ICY_BLUE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_TEAL | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_AQUAMARINE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_MOSS_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_YELLOW | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_YELLOW | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_ORANGE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_DARK_BROWN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SALMON_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_SATURATED_RED | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_RED | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_DARK_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x22, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
0x20, // COLOUR_LIGHT_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
};
void gfx_draw_pixel(rct_drawpixelinfo *dpi, int x, int y, int colour)
{
gfx_fill_rect(dpi, x, y, x, y, colour);

View File

@@ -127,6 +127,7 @@ extern const uint16 palette_to_g1_offset[];
extern uint8 gPeepPalette[256];
extern uint8 gOtherPalette[256];
extern uint8 text_palette[];
extern const uint8 _9DEDF4[];
extern int gLastDrawStringX;
extern int gLastDrawStringY;

View File

@@ -47,7 +47,7 @@ void gfx_fill_rect_inset(rct_drawpixelinfo* dpi, short left, short top, short ri
if (colour & 0x100) {
colour = NOT_TRANSLUCENT(colour);
} else {
colour = RCT2_ADDRESS(0x009DEDF4,uint8)[colour];
colour = _9DEDF4[colour];
}
colour = colour | 0x2000000; //Transparent

View File

@@ -306,8 +306,8 @@ static void window_dropdown_paint(rct_window *w, rct_drawpixelinfo *dpi)
b = t;
if (w->colours[0] & COLOUR_FLAG_TRANSLUCENT) {
gfx_fill_rect(dpi, l, t, r, b, (RCT2_ADDRESS(0x009DEDF4, uint8)[w->colours[0]] | 0x02000000) + 1);
gfx_fill_rect(dpi, l, t + 1, r, b + 1, (RCT2_ADDRESS(0x009DEDF4, uint8)[w->colours[0]] | 0x02000000) + 2);
gfx_fill_rect(dpi, l, t, r, b, (_9DEDF4[w->colours[0]] | 0x02000000) + 1);
gfx_fill_rect(dpi, l, t + 1, r, b + 1, (_9DEDF4[w->colours[0]] | 0x02000000) + 2);
} else {
gfx_fill_rect(dpi, l, t, r, b, ColourMapA[w->colours[0]].mid_dark);
gfx_fill_rect(dpi, l, t + 1, r, b + 1, ColourMapA[w->colours[0]].lightest);

View File

@@ -810,8 +810,8 @@ void window_themes_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scroll
if (y + _row_height >= dpi->y) {
if (i + 1 < get_colour_scheme_tab_count()) {
int colour = w->colours[1];
if (colour & 0x80) {
colour = RCT2_ADDRESS(0x009DEDF4, uint8)[colour];
if (colour & COLOUR_FLAG_TRANSLUCENT) {
colour = _9DEDF4[colour];
colour = colour | 0x2000000;
gfx_fill_rect(dpi, 0, y + _row_height - 2, window_themes_widgets[WIDX_THEMES_LIST].right, y + _row_height - 2, colour + 1);