mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Name more palettes

This commit is contained in:
Marijn van der Werf 2016-11-10 00:03:12 +01:00
parent 4f47808201
commit 06b128bac7
23 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/drawing/drawing.c
View File

@ -106,15 +106,15 @@ enum
SPR_PALETTE_3109 = 3109,
SPR_PALETTE_3110 = 3110,
SPR_PALETTE_4947 = 0x1353,
SPR_PALETTE_4948 = 0x1354,
SPR_PALETTE_4949 = 0x1355,
SPR_PALETTE_4950 = 0x1356,
SPR_PALETTE_4951 = 0x1357,
SPR_PALETTE_4952 = 0x1358,
SPR_PALETTE_4953 = 0x1359,
SPR_PALETTE_4954 = 0x135A,
SPR_PALETTE_4955 = 0x135B,
SPR_PALETTE_WATER = 4947,
SPR_PALETTE_4948 = 4948,
SPR_PALETTE_4949 = 4949,
SPR_PALETTE_4950 = 4950,
SPR_PALETTE_DARKEN_3 = 4951,
SPR_PALETTE_4952 = 4952,
SPR_PALETTE_DARKEN_1 = 4953,
SPR_PALETTE_DARKEN_2 = 4954,
SPR_PALETTE_4955 = 4955,
SPR_PALETTE_BLACK = 4915,
SPR_PALETTE_GREY = 4916,
@ -254,7 +254,7 @@ const uint16 palette_to_g1_offset[PALETTE_TO_G1_OFFSET_COUNT] = {
SPR_PALETTE_LIGHT_PINK,
SPR_PALETTE_4947, // PALETTE_32 (water)
SPR_PALETTE_WATER, // PALETTE_WATER (water)
SPR_PALETTE_3100,
SPR_PALETTE_3101, // PALETTE_34
SPR_PALETTE_3102,
@ -269,10 +269,10 @@ const uint16 palette_to_g1_offset[PALETTE_TO_G1_OFFSET_COUNT] = {
SPR_PALETTE_4948,
SPR_PALETTE_4949, // PALETTE_45
SPR_PALETTE_4950,
SPR_PALETTE_4951, // PALETTE_47
SPR_PALETTE_4952,
SPR_PALETTE_4953, // PALETTE_49
SPR_PALETTE_4954, // PALETTE_50 (construction marker)
SPR_PALETTE_DARKEN_3, // PALETTE_DARKEN_3
SPR_PALETTE_4952, // Decreases contrast
SPR_PALETTE_DARKEN_1, // PALETTE_DARKEN_1
SPR_PALETTE_DARKEN_2, // PALETTE_DARKEN_2 (construction marker)
SPR_PALETTE_4955, // PALETTE_51
// base shadow highlight
@ -499,70 +499,70 @@ const FILTER_PALETTE_ID _9DEDF4[] = {
PALETTE_TRANSLUCENT_LIGHT_PINK, // COLOUR_LIGHT_PINK | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_BLACK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_GREY | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_GREY | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_WHITE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_DARK_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_DARK_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_DARK_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_ICY_BLUE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_TEAL | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_TEAL | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_AQUAMARINE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_DARK_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_MOSS_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_MOSS_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_DARK_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_DARK_YELLOW | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_DARK_ORANGE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_DARK_BROWN | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_SALMON_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_SALMON_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_SATURATED_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_SATURATED_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_BRIGHT_RED | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_DARK_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_DARK_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_LIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_LIGHT_PINK | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_BLACK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_GREY | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_GREY | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_WHITE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_DARK_PURPLE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_DARK_PURPLE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_LIGHT_PURPLE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_BRIGHT_PURPLE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_DARK_BLUE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_LIGHT_BLUE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_ICY_BLUE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_TEAL | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_TEAL | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_AQUAMARINE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_SATURATED_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_DARK_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_MOSS_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_MOSS_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_BRIGHT_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_OLIVE_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_DARK_OLIVE_GREEN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_BRIGHT_YELLOW | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_YELLOW | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_DARK_YELLOW | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_DARK_YELLOW | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_LIGHT_ORANGE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_DARK_ORANGE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_DARK_ORANGE | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_LIGHT_BROWN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_SATURATED_BROWN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_DARK_BROWN | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_SALMON_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_SALMON_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_BORDEAUX_RED | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_SATURATED_RED | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_SATURATED_RED | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_BRIGHT_RED | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_DARK_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_DARK_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_34, // COLOUR_BRIGHT_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_32, // COLOUR_LIGHT_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
PALETTE_WATER, // COLOUR_LIGHT_PINK | COLOUR_FLAG_INSET | COLOUR_FLAG_TRANSLUCENT
};
void gfx_draw_pixel(rct_drawpixelinfo *dpi, int x, int y, int colour)

14
src/drawing/drawing.h
View File

@ -98,17 +98,17 @@ enum {
};
typedef enum {
PALETTE_32 = 0x20,
PALETTE_WATER = 32,
PALETTE_34 = 0x22,
PALETTE_34 = 34,
PALETTE_45 = 45,
PALETTE_45 = 45, // Decolorize + lighten
PALETTE_47 = 47,
PALETTE_DARKEN_3 = 47,
PALETTE_49 = 49,
PALETTE_50 = 50,
PALETTE_51 = 51,
PALETTE_DARKEN_1 = 49,
PALETTE_DARKEN_2 = 50,
PALETTE_51 = 51, // Decolorize + darken
PALETTE_TRANSLUCENT_GREY = 52,
PALETTE_TRANSLUCENT_LIGHT_BLUE = 55,

2
src/interface/widget.c
View File

@ -599,7 +599,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge
if (colour == 0)
gfx_fill_rect(dpi, l + 1, t + 1, r - 1, b - 1, ColourMapA[colour].dark);
else
gfx_filter_rect(dpi, l + 1, t + 1, r - 1, b - 1, PALETTE_47);
gfx_filter_rect(dpi, l + 1, t + 1, r - 1, b - 1, PALETTE_DARKEN_3);
// Draw text
if (widget->text == STR_NONE)

2
src/paint/map_element/surface.c
View File

@ -1363,7 +1363,7 @@ void surface_paint(uint8 direction, uint16 height, rct_map_element * mapElement)
image_offset = byte_97B740[surfaceShape & 0xF];
}
int image_id = (SPR_WATER_MASK + image_offset) | 0x60000000 | PALETTE_32 << 19;
int image_id = (SPR_WATER_MASK + image_offset) | 0x60000000 | PALETTE_WATER << 19;
sub_98196C(image_id, 0, 0, 32, 32, -1, waterHeight, rotation);
paint_attach_to_previous_ps(SPR_WATER_OVERLAY + image_offset, 0, 0);

2
src/paint/paint.c
View File

@ -25,7 +25,7 @@
const uint32 construction_markers[] = {
COLOUR_DARK_GREEN << 19 | COLOUR_GREY << 24 | IMAGE_TYPE_REMAP, // White
PALETTE_50 << 19 | IMAGE_TYPE_TRANSPARENT, // Translucent
PALETTE_DARKEN_2 << 19 | IMAGE_TYPE_TRANSPARENT, // Translucent
};
paint_struct * g_ps_F1AD28;

2
src/ride/gentle/dodgems.c
View File

@ -42,7 +42,7 @@ static void paint_dodgems_roof(int height, int offset)
uint32 image_id = (SPR_DODGEMS_ROOF_FRAME + offset) | gTrackColours[SCHEME_TRACK];
sub_98196C(image_id, 0, 0, 32, 32, 2, height, get_current_rotation());
image_id = (SPR_DODGEMS_ROOF_GLASS + offset) | (PALETTE_47 << 19) | IMAGE_TYPE_TRANSPARENT;
image_id = (SPR_DODGEMS_ROOF_GLASS + offset) | (PALETTE_DARKEN_3 << 19) | IMAGE_TYPE_TRANSPARENT;
paint_attach_to_previous_ps(image_id, 0, 0);
}

2
src/windows/dropdown.c
View File

@ -310,7 +310,7 @@ static void window_dropdown_paint(rct_window *w, rct_drawpixelinfo *dpi)
t = w->y + 2 + (cell_y * _dropdown_item_height);
r = l + _dropdown_item_width - 1;
b = t + _dropdown_item_height - 1;
gfx_filter_rect(dpi, l, t, r, b, PALETTE_47);
gfx_filter_rect(dpi, l, t, r, b, PALETTE_DARKEN_3);
}
item = gDropdownItemsFormat[i];

2
src/windows/editor_inventions_list.c
View File

@ -875,7 +875,7 @@ static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpix
top = itemY - 1;
bottom = itemY;
}
gfx_filter_rect(dpi, 0, top, w->width, bottom, PALETTE_49);
gfx_filter_rect(dpi, 0, top, w->width, bottom, PALETTE_DARKEN_1);
if (_editorInventionsListDraggedItem == NULL)
colour = 14;

2
src/windows/editor_object_selection.c
View File

@ -1415,7 +1415,7 @@ static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpi
// Highlight background
colour = 142;
if (listItem->entry == w->object_entry && !(*listItem->flags & OBJECT_SELECTION_FLAG_6)) {
gfx_filter_rect(dpi, 0, y, w->width, y + 11, PALETTE_49);
gfx_filter_rect(dpi, 0, y, w->width, y + 11, PALETTE_DARKEN_1);
colour = 14;
}

2
src/windows/editor_objective_options.c
View File

@ -1210,7 +1210,7 @@ static void window_editor_objective_options_rides_scrollpaint(rct_window *w, rct
// Highlighted
if (i == w->selected_list_item) {
stringId = STR_WINDOW_COLOUR_2_STRINGID;
gfx_filter_rect(dpi, 0, y, w->width, y + 11, PALETTE_49);
gfx_filter_rect(dpi, 0, y, w->width, y + 11, PALETTE_DARKEN_1);
} else {
stringId = STR_BLACK_STRING;
}

16
src/windows/error.c
View File

@ -164,15 +164,15 @@ static void window_error_paint(rct_window *w, rct_drawpixelinfo *dpi)
gfx_filter_rect(dpi, l + 1, t + 1, r - 1, b - 1, PALETTE_45);
gfx_filter_rect(dpi, l, t, r, b, PALETTE_GLASS_SATURATED_RED);
gfx_filter_rect(dpi, l, t + 2, l, b - 2, PALETTE_47);
gfx_filter_rect(dpi, r, t + 2, r, b - 2, PALETTE_47);
gfx_filter_rect(dpi, l + 2, b, r - 2, b, PALETTE_47);
gfx_filter_rect(dpi, l + 2, t, r - 2, t, PALETTE_47);
gfx_filter_rect(dpi, l, t + 2, l, b - 2, PALETTE_DARKEN_3);
gfx_filter_rect(dpi, r, t + 2, r, b - 2, PALETTE_DARKEN_3);
gfx_filter_rect(dpi, l + 2, b, r - 2, b, PALETTE_DARKEN_3);
gfx_filter_rect(dpi, l + 2, t, r - 2, t, PALETTE_DARKEN_3);
gfx_filter_rect(dpi, r + 1, t + 1, r + 1, t + 1, PALETTE_47);
gfx_filter_rect(dpi, r - 1, t + 1, r - 1, t + 1, PALETTE_47);
gfx_filter_rect(dpi, l + 1, b - 1, l + 1, b - 1, PALETTE_47);
gfx_filter_rect(dpi, r - 1, b - 1, r - 1, b - 1, PALETTE_47);
gfx_filter_rect(dpi, r + 1, t + 1, r + 1, t + 1, PALETTE_DARKEN_3);
gfx_filter_rect(dpi, r - 1, t + 1, r - 1, t + 1, PALETTE_DARKEN_3);
gfx_filter_rect(dpi, l + 1, b - 1, l + 1, b - 1, PALETTE_DARKEN_3);
gfx_filter_rect(dpi, r - 1, b - 1, r - 1, b - 1, PALETTE_DARKEN_3);
l = w->x + (w->width + 1) / 2 - 1;
t = w->y + 1;

2
src/windows/guest.c
View File

@ -1715,7 +1715,7 @@ void window_guest_rides_scroll_paint(rct_window *w, rct_drawpixelinfo *dpi, int
int y = list_index * 10;
int string_format = STR_BLACK_STRING;
if (list_index == w->selected_list_item){
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_49);
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1);
string_format = STR_WINDOW_COLOUR_2_STRINGID;
}
rct_ride* ride = get_ride(w->list_item_positions[list_index]);

4
src/windows/guest_list.c
View File

@ -728,7 +728,7 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
// Highlight backcolour and text colour (format)
format = STR_BLACK_STRING;
if (i == _window_guest_list_highlighted_index) {
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_49);
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1);
format = STR_WINDOW_COLOUR_2_STRINGID;
}
@ -792,7 +792,7 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
// Highlight backcolour and text colour (format)
format = STR_BLACK_STRING;
if (i == _window_guest_list_highlighted_index) {
gfx_filter_rect(dpi, 0, y, 800, y + 20, PALETTE_49);
gfx_filter_rect(dpi, 0, y, 800, y + 20, PALETTE_DARKEN_1);
format = STR_WINDOW_COLOUR_2_STRINGID;
}

2
src/windows/loadsave.c
View File

@ -524,7 +524,7 @@ static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, i
stringId = STR_BLACK_STRING;
if (i == w->selected_list_item) {
stringId = STR_WINDOW_COLOUR_2_STRINGID;
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_49);
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1);
}
set_format_arg(0, rct_string_id, STR_STRING);

4
src/windows/multiplayer.c
View File

@ -609,7 +609,7 @@ static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixeli
char* lineCh = buffer;
int colour = 0;
if (i == w->selected_list_item) {
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_49);
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1);
safe_strcpy(buffer, network_get_player_name(i), sizeof(buffer));
colour = w->colours[2];
} else {
@ -874,7 +874,7 @@ static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelin
for (int i = 0; i < network_get_num_actions(); i++) {
if (i == w->selected_list_item) {
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_49);
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1);
}
if (y > dpi->y + dpi->height) {
break;

2
src/windows/ride_list.c
View File

@ -535,7 +535,7 @@ static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
// Background highlight
if (i == w->selected_list_item) {
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_49);
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1);
format = STR_WINDOW_COLOUR_2_STRINGID;
}

2
src/windows/server_list.c
View File

@ -436,7 +436,7 @@ static void window_server_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi
// Draw hover highlight
if (highlighted) {
gfx_filter_rect(dpi, 0, y, width, y + ITEM_HEIGHT, PALETTE_49);
gfx_filter_rect(dpi, 0, y, width, y + ITEM_HEIGHT, PALETTE_DARKEN_1);
gVersion = serverDetails->version;
w->widgets[WIDX_LIST].tooltip = STR_NETWORK_VERSION_TIP;
}

2
src/windows/shortcut_keys.c
View File

@ -253,7 +253,7 @@ static void window_shortcut_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, i
int format = STR_BLACK_STRING;
if (i == w->selected_list_item) {
format = STR_WINDOW_COLOUR_2_STRINGID;
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_49);
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1);
}
char templateString[128];

2
src/windows/staff_list.c
View File

@ -653,7 +653,7 @@ void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int sc
int format = (_quick_fire_mode ? STR_RED_STRINGID : STR_BLACK_STRING);
if (i == _windowStaffListHighlightedIndex) {
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_49);
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1);
format = (_quick_fire_mode ? STR_LIGHTPINK_STRINGID : STR_WINDOW_COLOUR_2_STRINGID);
}

2
src/windows/title_scenarioselect.c
View File

@ -479,7 +479,7 @@ static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo *
const scenario_index_entry *scenario = listItem->scenario.scenario;
bool isHighlighted = w->highlighted_scenario == scenario;
if (isHighlighted) {
gfx_filter_rect(dpi, 0, y, w->width, y + 23, PALETTE_49);
gfx_filter_rect(dpi, 0, y, w->width, y + 23, PALETTE_DARKEN_1);
}
bool isCompleted = scenario->highscore != NULL;

16
src/windows/tooltip.c
View File

@ -198,16 +198,16 @@ static void window_tooltip_paint(rct_window *w, rct_drawpixelinfo *dpi)
gfx_filter_rect(dpi, left + 1, top + 1, right - 1, bottom - 1, PALETTE_GLASS_LIGHT_ORANGE);
// Sides
gfx_filter_rect(dpi, left + 0, top + 2, left + 0, bottom - 2, PALETTE_47);
gfx_filter_rect(dpi, right + 0, top + 2, right + 0, bottom - 2, PALETTE_47);
gfx_filter_rect(dpi, left + 2, bottom + 0, right - 2, bottom + 0, PALETTE_47);
gfx_filter_rect(dpi, left + 2, top + 0, right - 2, top + 0, PALETTE_47);
gfx_filter_rect(dpi, left + 0, top + 2, left + 0, bottom - 2, PALETTE_DARKEN_3);
gfx_filter_rect(dpi, right + 0, top + 2, right + 0, bottom - 2, PALETTE_DARKEN_3);
gfx_filter_rect(dpi, left + 2, bottom + 0, right - 2, bottom + 0, PALETTE_DARKEN_3);
gfx_filter_rect(dpi, left + 2, top + 0, right - 2, top + 0, PALETTE_DARKEN_3);
// Corners
gfx_filter_pixel(dpi, left + 1, top + 1, PALETTE_47);
gfx_filter_pixel(dpi, right - 1, top + 1, PALETTE_47);
gfx_filter_pixel(dpi, left + 1, bottom - 1, PALETTE_47);
gfx_filter_pixel(dpi, right - 1, bottom - 1, PALETTE_47);
gfx_filter_pixel(dpi, left + 1, top + 1, PALETTE_DARKEN_3);
gfx_filter_pixel(dpi, right - 1, top + 1, PALETTE_DARKEN_3);
gfx_filter_pixel(dpi, left + 1, bottom - 1, PALETTE_DARKEN_3);
gfx_filter_pixel(dpi, right - 1, bottom - 1, PALETTE_DARKEN_3);
// Text
left = w->x + ((w->width + 1) / 2) - 1;

4
src/windows/track_list.c
View File

@ -574,7 +574,7 @@ static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
rct_string_id stringId;
if (listIndex == w->selected_list_item) {
// Highlight
gfx_filter_rect(dpi, x, y, w->width, y + 9, PALETTE_49);
gfx_filter_rect(dpi, x, y, w->width, y + 9, PALETTE_DARKEN_1);
stringId = STR_WINDOW_COLOUR_2_STRINGID;
} else {
stringId = STR_BLACK_STRING;
@ -591,7 +591,7 @@ static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
rct_string_id stringId;
if (listIndex == w->selected_list_item) {
// Highlight
gfx_filter_rect(dpi, x, y, w->width, y + 9, PALETTE_49);
gfx_filter_rect(dpi, x, y, w->width, y + 9, PALETTE_DARKEN_1);
stringId = STR_WINDOW_COLOUR_2_STRINGID;
} else {
stringId = STR_BLACK_STRING;

6
src/world/climate.c
View File

@ -348,9 +348,9 @@ static int climate_play_thunder(int instanceIndex, int soundId, int volume, int
/** rct2: 0x0098195C */
const FILTER_PALETTE_ID ClimateWeatherGloomColours[4] = {
0,
PALETTE_49,
PALETTE_50,
PALETTE_47,
PALETTE_DARKEN_1,
PALETTE_DARKEN_2,
PALETTE_DARKEN_3,
};
// rct2: 0x00993C94