diff --git a/src/interface/colour.h b/src/interface/colour.h index cd63adc57a..e51c280082 100644 --- a/src/interface/colour.h +++ b/src/interface/colour.h @@ -68,7 +68,7 @@ enum { }; #define COLOUR_FLAG_OUTLINE (1 << 5) -#define COLOUR_FLAG_INSET (1 << 6) +#define COLOUR_FLAG_INSET (1 << 6) // 64, 0x40 #define COLOUR_FLAG_TRANSLUCENT (1 << 7) #define COLOUR_FLAG_8 (1 << 8) #define TRANSLUCENT(x) ((x) | COLOUR_FLAG_TRANSLUCENT) diff --git a/src/interface/console.c b/src/interface/console.c index 935e34988a..b8f9dc3ffd 100644 --- a/src/interface/console.c +++ b/src/interface/console.c @@ -207,7 +207,7 @@ void console_draw(rct_drawpixelinfo *dpi) memcpy(lineCh, ch, lineLength); lineCh[lineLength] = 0; - gfx_draw_string(dpi, lineBuffer, 100, x, y); //Value 100 outlines the letters + gfx_draw_string(dpi, lineBuffer, COLOUR_LIGHT_PURPLE | COLOUR_FLAG_OUTLINE | COLOUR_FLAG_INSET, x, y); x = gLastDrawStringX; diff --git a/src/interface/widget.c b/src/interface/widget.c index 2e511ab970..4f2fdb27aa 100644 --- a/src/interface/widget.c +++ b/src/interface/widget.c @@ -412,7 +412,7 @@ static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widge if (widget->type == WWT_13) { if (widget_is_disabled(w, widgetIndex)) - colour |= 0x40; + colour |= COLOUR_FLAG_INSET; gfx_draw_string_left_clipped( dpi, stringId, @@ -425,7 +425,7 @@ static void widget_text_unknown(rct_drawpixelinfo *dpi, rct_window *w, int widge } else { colour &= ~(1 << 7); if (widget_is_disabled(w, widgetIndex)) - colour |= 0x40; + colour |= COLOUR_FLAG_INSET; gfx_draw_string_centred_clipped( dpi, stringId, @@ -460,7 +460,7 @@ static void widget_text(rct_drawpixelinfo *dpi, rct_window *w, int widgetIndex) return; if (widget_is_disabled(w, widgetIndex)) - colour |= 0x40; + colour |= COLOUR_FLAG_INSET; gfx_draw_string_left_clipped(dpi, widget->text, gCommonFormatArgs, colour, l + 1, t, r - l); } @@ -614,7 +614,7 @@ static void widget_caption_draw(rct_drawpixelinfo *dpi, rct_window *w, int widge width -= 10; } l += width / 2; - gfx_draw_string_centred_clipped(dpi, widget->text, gCommonFormatArgs, 34, l, t, width); + gfx_draw_string_centred_clipped(dpi, widget->text, gCommonFormatArgs, COLOUR_WHITE | COLOUR_FLAG_OUTLINE, l, t, width); } /** @@ -652,7 +652,7 @@ static void widget_closebox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg t = w->y + max(widget->top, (widget->top + widget->bottom) / 2 - 5); if (widget_is_disabled(w, widgetIndex)) - colour |= 0x40; + colour |= COLOUR_FLAG_INSET; gfx_draw_string_centred_clipped(dpi, widget->text, gCommonFormatArgs, colour, l, t, widget->right - widget->left - 2); } @@ -682,7 +682,7 @@ static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg // fill it when checkbox is pressed if (widget_is_pressed(w, widgetIndex)) { gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - gfx_draw_string(dpi, (char*)CheckBoxMarkString, colour & 0x7F, l, yMid - 5); + gfx_draw_string(dpi, (char*)CheckBoxMarkString, NOT_TRANSLUCENT(colour), l, yMid - 5); } } @@ -691,7 +691,7 @@ static void widget_checkbox_draw(rct_drawpixelinfo *dpi, rct_window *w, int widg return; if (widget_is_disabled(w, widgetIndex)) { - colour |= 0x40; + colour |= COLOUR_FLAG_INSET; } gfx_draw_string_left_centred(dpi, widget->text, gCommonFormatArgs, colour, l + 14, yMid); diff --git a/src/windows/dropdown.c b/src/windows/dropdown.c index c2dc03de28..5796b5a76b 100644 --- a/src/windows/dropdown.c +++ b/src/windows/dropdown.c @@ -338,10 +338,10 @@ static void window_dropdown_paint(rct_window *w, rct_drawpixelinfo *dpi) // Calculate colour colour = NOT_TRANSLUCENT(w->colours[0]); if (i == highlightedIndex) - colour = 2; + colour = COLOUR_WHITE; if (dropdown_is_disabled(i)) if (i < 64) - colour = NOT_TRANSLUCENT(w->colours[0]) | 0x40; + colour = NOT_TRANSLUCENT(w->colours[0]) | COLOUR_FLAG_INSET; // Draw item string gfx_draw_string_left_clipped( diff --git a/src/windows/editor_bottom_toolbar.c b/src/windows/editor_bottom_toolbar.c index d2f2e3285b..3f61c1511d 100644 --- a/src/windows/editor_bottom_toolbar.c +++ b/src/windows/editor_bottom_toolbar.c @@ -502,8 +502,8 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi) if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) stringId = STR_EDITOR_STEP_OBJECT_SELECTION; - gfx_draw_string_centred(dpi, STR_BACK_TO_PREVIOUS_STEP, textX, textY, textColour, 0); - gfx_draw_string_centred(dpi, stringId, textX, textY + 10, textColour, 0); + gfx_draw_string_centred(dpi, STR_BACK_TO_PREVIOUS_STEP, textX, textY, textColour, NULL); + gfx_draw_string_centred(dpi, stringId, textX, textY + 10, textColour, NULL); } if ((drawPreviousButton || drawNextButton) && gS6Info.editor_step != EDITOR_STEP_ROLLERCOASTER_DESIGNER) { @@ -516,7 +516,7 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi) if (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_NEXT_STEP_BUTTON ) { - textColour = 2; + textColour = COLOUR_WHITE; } short textX = (window_editor_bottom_toolbar_widgets[WIDX_NEXT_IMAGE].left + @@ -527,8 +527,8 @@ void window_editor_bottom_toolbar_paint(rct_window *w, rct_drawpixelinfo *dpi) if (gScreenFlags & SCREEN_FLAGS_TRACK_DESIGNER) stringId = STR_EDITOR_STEP_ROLLERCOASTER_DESIGNER; - gfx_draw_string_centred(dpi, STR_FORWARD_TO_NEXT_STEP, textX, textY, textColour, 0); - gfx_draw_string_centred(dpi, stringId, textX, textY + 10, textColour, 0); + gfx_draw_string_centred(dpi, STR_FORWARD_TO_NEXT_STEP, textX, textY, textColour, NULL); + gfx_draw_string_centred(dpi, stringId, textX, textY + 10, textColour, NULL); } } diff --git a/src/windows/editor_inventions_list.c b/src/windows/editor_inventions_list.c index ab9875d51c..741ebc6560 100644 --- a/src/windows/editor_inventions_list.c +++ b/src/windows/editor_inventions_list.c @@ -864,7 +864,7 @@ static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpix if (itemY + 10 < dpi->y || itemY >= dpi->y + dpi->height) continue; - colour = 142; + uint8 colour = COLOUR_BRIGHT_GREEN | COLOUR_FLAG_TRANSLUCENT; if (w->research_item == researchItem) { if (_editorInventionsListDraggedItem == NULL) { // Highlight @@ -878,7 +878,7 @@ static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpix gfx_filter_rect(dpi, 0, top, w->width, bottom, PALETTE_DARKEN_1); if (_editorInventionsListDraggedItem == NULL) - colour = 14; + colour = COLOUR_BRIGHT_GREEN; } if (researchItem->entryIndex == RESEARCHED_ITEMS_SEPARATOR || researchItem->entryIndex == RESEARCHED_ITEMS_END) @@ -892,17 +892,17 @@ static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpix ptr = buffer; if (!disableItemMovement) { - ptr = utf8_write_codepoint(ptr, colour & 0xFF); + ptr = utf8_write_codepoint(ptr, colour); } format_string(ptr, 256, stringId, NULL); if (disableItemMovement) { gCurrentFontSpriteBase = -1; - if ((colour & 0xFF) == 14 && _editorInventionsListDraggedItem == NULL) { + if (colour == COLOUR_BRIGHT_GREEN && _editorInventionsListDraggedItem == NULL) { gCurrentFontSpriteBase = -2; } - colour = 64 | w->colours[1]; + colour = COLOUR_FLAG_INSET | w->colours[1]; } else { gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; colour = COLOUR_BLACK; diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c index 35dcb0dadc..8d4c51588b 100644 --- a/src/windows/editor_object_selection.c +++ b/src/windows/editor_object_selection.c @@ -1369,13 +1369,13 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf case 2: stringId = STR_OBJECT_FILTER_TT; break; default: stringId = STR_OBJECT_FILTER_CUSTOM; break; } - gfx_draw_string_right(dpi, stringId, NULL, 2, w->x + w->width - 5, w->y + w->height - 3 - 12 - 14); + gfx_draw_string_right(dpi, stringId, NULL, COLOUR_WHITE, w->x + w->width - 5, w->y + w->height - 3 - 12 - 14); // if (w->selected_tab == WINDOW_OBJECT_SELECTION_PAGE_RIDE_VEHICLES_ATTRACTIONS) { y = w->y + w->height - 3 - 12 - 14 - 14; stringId = get_ride_type_string_id(listItem->repositoryItem); - gfx_draw_string_right(dpi, stringId, NULL, 2, w->x + w->width - 5, y); + gfx_draw_string_right(dpi, stringId, NULL, COLOUR_WHITE, w->x + w->width - 5, y); y -= 11; } @@ -1425,7 +1425,7 @@ static void window_editor_object_selection_scrollpaint(rct_window *w, rct_drawpi gCurrentFontSpriteBase = colour == 14 ? -2 : -1; colour2 = w->colours[1] & 0x7F; if (*listItem->flags & (OBJECT_SELECTION_FLAG_IN_USE | OBJECT_SELECTION_FLAG_ALWAYS_REQUIRED)) - colour2 |= 0x40; + colour2 |= COLOUR_FLAG_INSET; gfx_draw_string(dpi, (char*)CheckBoxMarkString, colour2, x, y); } diff --git a/src/windows/game_bottom_toolbar.c b/src/windows/game_bottom_toolbar.c index cf65d58b3d..b6687f88ce 100644 --- a/src/windows/game_bottom_toolbar.c +++ b/src/windows/game_bottom_toolbar.c @@ -402,7 +402,7 @@ static void window_game_bottom_toolbar_draw_left_panel(rct_drawpixelinfo *dpi, r dpi, guestCountFormats[gGuestChangeModifier], x, y, - (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_GUESTS ? COLOUR_WHITE : w->colours[0] & 0x7F), + (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_GUESTS ? COLOUR_WHITE : NOT_TRANSLUCENT(w->colours[0])), &gNumGuestsInPark ); @@ -470,7 +470,7 @@ static void window_game_bottom_toolbar_draw_right_panel(rct_drawpixelinfo *dpi, stringId, x, y, - (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_DATE ? COLOUR_WHITE : w->colours[0] & 0x7F), + (gHoverWidget.window_classification == WC_BOTTOM_TOOLBAR && gHoverWidget.widget_index == WIDX_DATE ? COLOUR_WHITE : NOT_TRANSLUCENT(w->colours[0])), gCommonFormatArgs ); @@ -529,7 +529,7 @@ static void window_game_bottom_toolbar_draw_news_item(rct_drawpixelinfo *dpi, rc x = w->x + (middleOutsetWidget->left + middleOutsetWidget->right) / 2; y = w->y + middleOutsetWidget->top + 11; width = middleOutsetWidget->right - middleOutsetWidget->left - 62; - gfx_draw_string_centred_wrapped_partial(dpi, x, y, width, 14, STR_BOTTOM_TOOLBAR_NEWS_TEXT, &newsItemText, newsItem->ticks); + gfx_draw_string_centred_wrapped_partial(dpi, x, y, width, COLOUR_BRIGHT_GREEN, STR_BOTTOM_TOOLBAR_NEWS_TEXT, &newsItemText, newsItem->ticks); x = w->x + window_game_bottom_toolbar_widgets[WIDX_NEWS_SUBJECT].left; y = w->y + window_game_bottom_toolbar_widgets[WIDX_NEWS_SUBJECT].top; diff --git a/src/windows/loadsave.c b/src/windows/loadsave.c index 419447c411..a2636a9195 100644 --- a/src/windows/loadsave.c +++ b/src/windows/loadsave.c @@ -495,7 +495,7 @@ static void window_loadsave_paint(rct_window *w, rct_drawpixelinfo *dpi) id = STR_UP; else if (gConfigGeneral.load_save_sort == SORT_NAME_DESCENDING) id = STR_DOWN; - gfx_draw_string_centred_clipped(dpi, STR_NAME, &id, 1, w->x + 4 + (w->width - 8) / 4, w->y + 50, (w->width - 8) / 2); + gfx_draw_string_centred_clipped(dpi, STR_NAME, &id, COLOUR_GREY, w->x + 4 + (w->width - 8) / 4, w->y + 50, (w->width - 8) / 2); // Date button text if (gConfigGeneral.load_save_sort == SORT_DATE_ASCENDING) id = STR_UP; @@ -503,7 +503,7 @@ static void window_loadsave_paint(rct_window *w, rct_drawpixelinfo *dpi) id = STR_DOWN; else id = STR_NONE; - gfx_draw_string_centred_clipped(dpi, STR_DATE, &id, 1, w->x + 4 + (w->width - 8) * 3 / 4, w->y + 50, (w->width - 8) / 2); + gfx_draw_string_centred_clipped(dpi, STR_DATE, &id, COLOUR_GREY, w->x + 4 + (w->width - 8) * 3 / 4, w->y + 50, (w->width - 8) / 2); } static void window_loadsave_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int scrollIndex) diff --git a/src/windows/news.c b/src/windows/news.c index 54555b04ae..dacb22ae05 100644 --- a/src/windows/news.c +++ b/src/windows/news.c @@ -300,7 +300,7 @@ static void window_news_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int s ch = utf8_write_codepoint(ch, FORMAT_SMALLFONT); memcpy(ch, newsItem->text, 256); ch = buffer; - gfx_draw_string_left_wrapped(dpi, &ch, 2, y + 10, 325, STR_STRING, 14); + gfx_draw_string_left_wrapped(dpi, &ch, 2, y + 10, 325, STR_STRING, COLOUR_BRIGHT_GREEN); // Subject button if ((news_type_properties[newsItem->type] & NEWS_TYPE_HAS_SUBJECT) && !(newsItem->flags & 1)) { diff --git a/src/windows/ride.c b/src/windows/ride.c index c8ab21f1f3..c5c4706012 100644 --- a/src/windows/ride.c +++ b/src/windows/ride.c @@ -5376,7 +5376,7 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi } else { //sadly, STR_RIDE_LENGTH_ENTRY_WITH_SEPARATOR are defined with the separator AFTER an entry //therefore we set the last entry to use the no-separator format now, post-format - set_format_arg(0 + ((numLengths - 1) * 4), uint16, STR_RIDE_LENGTH_ENTRY); + set_format_arg(0 + ((numLengths - 1) * 4), rct_string_id, STR_RIDE_LENGTH_ENTRY); } set_format_arg(0 + (numLengths * 4), uint16, 0); set_format_arg(2 + (numLengths * 4), uint16, 0); diff --git a/src/windows/text_input.c b/src/windows/text_input.c index 49c94e324d..18ec555465 100644 --- a/src/windows/text_input.c +++ b/src/windows/text_input.c @@ -332,7 +332,7 @@ static void window_text_input_paint(rct_window *w, rct_drawpixelinfo *dpi) gfx_fill_rect(dpi, x - 1, y - 1, x + w + 1, y + h + 1, 12); gfx_fill_rect(dpi, x, y, x + w, y + h, 0); - gfx_draw_string(dpi, gTextInputComposition, 12, x, y); + gfx_draw_string(dpi, gTextInputComposition, COLOUR_DARK_GREEN, x, y); } } diff --git a/src/windows/tile_inspector.c b/src/windows/tile_inspector.c index d109e76b03..d279a29be1 100644 --- a/src/windows/tile_inspector.c +++ b/src/windows/tile_inspector.c @@ -1728,11 +1728,11 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { } // Draw coordinates - gfx_draw_string(dpi, "X:", 12, w->x + 6, w->y + 24); - gfx_draw_string(dpi, "Y:", 12, w->x + 64, w->y + 24); + gfx_draw_string(dpi, "X:", COLOUR_DARK_GREEN, w->x + 6, w->y + 24); + gfx_draw_string(dpi, "Y:", COLOUR_DARK_GREEN, w->x + 64, w->y + 24); if (windowTileInspectorTileSelected) { - gfx_draw_string_right(dpi, STR_FORMAT_INTEGER, &windowTileInspectorTileX, 12, w->x + 48, w->y + 24); - gfx_draw_string_right(dpi, STR_FORMAT_INTEGER, &windowTileInspectorTileY, 12, w->x + 105, w->y + 24); + gfx_draw_string_right(dpi, STR_FORMAT_INTEGER, &windowTileInspectorTileX, COLOUR_DARK_GREEN, w->x + 48, w->y + 24); + gfx_draw_string_right(dpi, STR_FORMAT_INTEGER, &windowTileInspectorTileY, COLOUR_DARK_GREEN, w->x + 105, w->y + 24); } else { // TODO: Draw -- or something similar @@ -1751,13 +1751,13 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { // Details // Terrain texture name rct_string_id terrainNameId = terrainTypeStringIds[map_element_get_terrain(mapElement)]; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_TERAIN, &terrainNameId, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_TERAIN, &terrainNameId, COLOUR_DARK_GREEN, x, y); // Edge texture name int idx = map_element_get_terrain_edge(mapElement); openrct2_assert(idx < countof(terrainEdgeTypeStringIds), "Tried accessing invalid entry %d in terrainEdgeTypeStringIds", idx); rct_string_id terrainEdgeNameId = terrainEdgeTypeStringIds[map_element_get_terrain_edge(mapElement)]; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_EDGE, &terrainEdgeNameId, 12, x, y + 11); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_EDGE, &terrainEdgeNameId, COLOUR_DARK_GREEN, x, y + 11); // Land ownership rct_string_id landOwnership; @@ -1766,27 +1766,27 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { else if (mapElement->properties.surface.ownership & OWNERSHIP_CONSTRUCTION_RIGHTS_OWNED) landOwnership = STR_CONSTRUCTION_RIGHTS_OWNED; else if (mapElement->properties.surface.ownership & OWNERSHIP_CONSTRUCTION_RIGHTS_AVAILABLE) landOwnership = STR_CONSTRUCTION_RIGHTS_SALE; else landOwnership = STR_TILE_INSPECTOR_LAND_NOT_OWNED_AND_NOT_AVAILABLE; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_OWNERSHIP, &landOwnership, 12, x, y + 22); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_OWNERSHIP, &landOwnership, COLOUR_DARK_GREEN, x, y + 22); // Water level int waterLevel = mapElement->properties.surface.terrain & MAP_ELEMENT_WATER_HEIGHT_MASK; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_WATER_LEVEL, &waterLevel, 12, x, y + 33); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_WATER_LEVEL, &waterLevel, COLOUR_DARK_GREEN, x, y + 33); // Properties // Raise / lower label x = w->x + w->widgets[WIDX_GROUPBOX_DETAILS].left + 7; y = w->y + w->widgets[WIDX_SURFACE_SPINNER_HEIGHT].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, COLOUR_DARK_GREEN, x, y); // Current base height x = w->x + w->widgets[WIDX_SURFACE_SPINNER_HEIGHT].left + 3; int baseHeight = mapElement->base_height; - gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x, y); + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); // Raised corners x = w->x + w->widgets[WIDX_GROUPBOX_DETAILS].left + 7; y = w->y + w->widgets[WIDX_SURFACE_CHECK_CORNER_E].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_CORNERS, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SURFACE_CORNERS, NULL, COLOUR_DARK_GREEN, x, y); break; } @@ -1794,32 +1794,32 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { // Details // Path name rct_string_id pathNameId = get_footpath_entry(footpath_element_get_type(mapElement))->string_idx; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_PATH_NAME, &pathNameId, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_PATH_NAME, &pathNameId, COLOUR_DARK_GREEN, x, y); // Path addition if (footpath_element_has_path_scenery(mapElement)) { const uint8 pathAdditionType = footpath_element_get_path_scenery_index(mapElement); rct_string_id additionNameId = get_footpath_item_entry(pathAdditionType)->name; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_PATH_ADDITIONS, &additionNameId, 12, x, y + 11); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_PATH_ADDITIONS, &additionNameId, COLOUR_DARK_GREEN, x, y + 11); } else - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_PATH_ADDITIONS_NONE, NULL, 12, x, y + 11); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_PATH_ADDITIONS_NONE, NULL, COLOUR_DARK_GREEN, x, y + 11); // Properties // Raise / lower label x = w->x + w->widgets[WIDX_GROUPBOX_DETAILS].left + 7; y = w->y + w->widgets[WIDX_PATH_SPINNER_HEIGHT].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, COLOUR_DARK_GREEN, x, y); // Current base height x = w->x + w->widgets[WIDX_PATH_SPINNER_HEIGHT].left + 3; int baseHeight = mapElement->base_height; - gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x, y); + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); // Path connections x = w->x + w->widgets[WIDX_GROUPBOX_DETAILS].left + 7; y = w->y + w->widgets[WIDX_PATH_CHECK_EDGE_W].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_PATH_CONECTED_EDGES, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_PATH_CONECTED_EDGES, NULL, COLOUR_DARK_GREEN, x, y); break; } @@ -1829,26 +1829,26 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { sint16 rideId = mapElement->properties.track.ride_index; rct_ride *ride = get_ride(rideId); rct_string_id rideType = STR_RIDE_NAME_SPIRAL_ROLLER_COASTER + ride->type; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_RIDE_TYPE, &rideType, 12, x, y); - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_RIDE_ID, &rideId, 12, x, y + 11); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_RIDE_TYPE, &rideType, COLOUR_DARK_GREEN, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_RIDE_ID, &rideId, COLOUR_DARK_GREEN, x, y + 11); set_format_arg(0, rct_string_id, ride->name); set_format_arg(0 + sizeof(rct_string_id), uint32, ride->name_arguments); - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_RIDE_NAME, gCommonFormatArgs, 12, x, y + 22); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_RIDE_NAME, gCommonFormatArgs, COLOUR_DARK_GREEN, x, y + 22); // Track sint16 trackType = mapElement->properties.track.type; sint16 sequenceNumber = mapElement->properties.track.sequence & 0x0F; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_PIECE_ID, &trackType, 12, x, y + 33); - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_SEQUENCE, &sequenceNumber, 12, x, y + 44); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_PIECE_ID, &trackType, COLOUR_DARK_GREEN, x, y + 33); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_TRACK_SEQUENCE, &sequenceNumber, COLOUR_DARK_GREEN, x, y + 44); // Properties // Raise / lower label y = w->y + w->widgets[WIDX_TRACK_SPINNER_HEIGHT].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, COLOUR_DARK_GREEN, x, y); // Current base height x = w->x + w->widgets[WIDX_TRACK_SPINNER_HEIGHT].left + 3; int baseHeight = mapElement->base_height; - gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x, y); + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); break; } @@ -1856,7 +1856,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { // Details // Age sint16 age = mapElement->properties.scenery.age; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SCENERY_AGE, &age, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SCENERY_AGE, &age, COLOUR_DARK_GREEN, x, y); // Quadrant value if (!(get_small_scenery_entry(mapElement->properties.scenery.type)->small_scenery.flags & SMALL_SCENERY_FLAG_FULL_TILE)) { @@ -1867,31 +1867,31 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { STR_TILE_INSPECTOR_SCENERY_QUADRANT_NE, STR_TILE_INSPECTOR_SCENERY_QUADRANT_SE }; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SCENERY_QUADRANT, &quadrant_string_idx[quadrant], 12, x, y + 11); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SCENERY_QUADRANT, &quadrant_string_idx[quadrant], COLOUR_DARK_GREEN, x, y + 11); } // Scenery ID sint16 idx = mapElement->properties.scenery.type; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SCENERY_ENTRY_IDX, &idx, 12, x, y + 22); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SCENERY_ENTRY_IDX, &idx, COLOUR_DARK_GREEN, x, y + 22); // Properties // Raise / Lower y = w->y + w->widgets[WIDX_SCENERY_SPINNER_HEIGHT].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, COLOUR_DARK_GREEN, x, y); // Current base height x = w->x + w->widgets[WIDX_SCENERY_SPINNER_HEIGHT].left + 3; int baseHeight = mapElement->base_height; - gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x, y); + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); // Quarter tile x = w->x + w->widgets[WIDX_GROUPBOX_DETAILS].left + 7; y = w->y + w->widgets[WIDX_SCENERY_CHECK_QUARTER_E].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SCENERY_QUADRANT_LABEL, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_SCENERY_QUADRANT_LABEL, NULL, COLOUR_DARK_GREEN, x, y); // Collision y = w->y + w->widgets[WIDX_SCENERY_CHECK_COLLISION_E].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_COLLISSION, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_COLLISSION, NULL, COLOUR_DARK_GREEN, x, y); break; } @@ -1899,7 +1899,7 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { // Details // Entrance type rct_string_id entranceType = entranceTypeStringIds[mapElement->properties.entrance.type]; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_TYPE, &entranceType, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_TYPE, &entranceType, COLOUR_DARK_GREEN, x, y); if (mapElement->properties.entrance.type == ENTRANCE_TYPE_PARK_ENTRANCE) { // Park entrance ID @@ -1907,40 +1907,40 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { int middleY = windowTileInspectorTileY << 5; // TODO: Make this work with Left/Right park entrance parts sint16 parkEntranceIndex = park_get_entrance_index(middleX, middleY, mapElement->base_height * 8); - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_ENTRANCE_ID, &parkEntranceIndex, 12, x, y + 11); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_ENTRANCE_ID, &parkEntranceIndex, COLOUR_DARK_GREEN, x, y + 11); } else { sint16 rideEntranceIndex = (mapElement->properties.entrance.index & 0x30) >> 4; if (mapElement->properties.entrance.type == ENTRANCE_TYPE_RIDE_ENTRANCE) { // Ride entrance ID - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_ENTRANCE_ID, &rideEntranceIndex, 12, x, y + 11); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_ENTRANCE_ID, &rideEntranceIndex, COLOUR_DARK_GREEN, x, y + 11); } else { // Ride exit ID - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_EXIT_ID, &rideEntranceIndex, 12, x, y + 11); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_EXIT_ID, &rideEntranceIndex, COLOUR_DARK_GREEN, x, y + 11); } } if (mapElement->properties.entrance.type == ENTRANCE_TYPE_PARK_ENTRANCE) { // Entrance part rct_string_id entrancePart = parkEntrancePartStringIds[mapElement->properties.entrance.index & 0x0F]; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_PART, &entrancePart, 12, x, y + 22); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_PART, &entrancePart, COLOUR_DARK_GREEN, x, y + 22); } else { // Ride ID sint16 rideId = mapElement->properties.entrance.ride_index; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_RIDE_ID, &rideId, 12, x, y + 22); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRANCE_RIDE_ID, &rideId, COLOUR_DARK_GREEN, x, y + 22); } // Properties // Raise / Lower y = w->y + w->widgets[WIDX_ENTRANCE_SPINNER_HEIGHT].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, COLOUR_DARK_GREEN, x, y); // Current base height x = w->x + w->widgets[WIDX_ENTRANCE_SPINNER_HEIGHT].left + 3; int baseHeight = mapElement->base_height; - gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x, y); + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); break; } @@ -1948,31 +1948,31 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { // Details // Type sint16 fenceType = mapElement->properties.fence.type; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_FENCE_TYPE, &fenceType, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_FENCE_TYPE, &fenceType, COLOUR_DARK_GREEN, x, y); // Banner info rct_wall_scenery_entry fenceEntry = get_wall_entry(fenceType)->wall; if (fenceEntry.flags & WALL_SCENERY_IS_BANNER) { - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, &gBanners[mapElement->properties.fence.item[0]].string_idx, 12, x, y + 11); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, &gBanners[mapElement->properties.fence.item[0]].string_idx, COLOUR_DARK_GREEN, x, y + 11); } else { - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_NONE, NULL, 12, x, y + 11); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_NONE, NULL, COLOUR_DARK_GREEN, x, y + 11); } // Properties // Raise / lower label y = w->y + w->widgets[WIDX_FENCE_SPINNER_HEIGHT].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, COLOUR_DARK_GREEN, x, y); // Current base height x = w->x + w->widgets[WIDX_FENCE_SPINNER_HEIGHT].left + 3; int baseHeight = mapElement->base_height; - gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x, y); + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); // Slope label x = w->x + w->widgets[WIDX_GROUPBOX_DETAILS].left + 7; y = w->y + w->widgets[WIDX_FENCE_DROPDOWN_SLOPE].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_FENCE_SLOPE, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_FENCE_SLOPE, NULL, COLOUR_DARK_GREEN, x, y); break; } @@ -1981,11 +1981,11 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { // Details // Type sint16 largeSceneryType = mapElement->properties.scenerymultiple.type & 0x03FF; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_LARGE_SCENERY_TYPE, &largeSceneryType, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_LARGE_SCENERY_TYPE, &largeSceneryType, COLOUR_DARK_GREEN, x, y); // Part ID sint16 pieceID = (mapElement->properties.scenerymultiple.type & 0xFC00) >> 10; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_LARGE_SCENERY_PIECE_ID, &pieceID, 12, x, y + 11); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_LARGE_SCENERY_PIECE_ID, &pieceID, COLOUR_DARK_GREEN, x, y + 11); // Banner info rct_scenery_entry *largeSceneryEntry = get_large_scenery_entry(mapElement->properties.scenerymultiple.type & MAP_ELEMENT_LARGE_TYPE_MASK); @@ -1994,21 +1994,21 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { ((mapElement->properties.scenerymultiple.colour[0] & 0xE0) >> 2) | ((mapElement->properties.scenerymultiple.colour[1] & 0xE0) >> 5); //window_sign_open(bannerIndex); - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, &gBanners[bannerIndex].string_idx, 12, x, y + 22); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, &gBanners[bannerIndex].string_idx, COLOUR_DARK_GREEN, x, y + 22); } else { - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_NONE, NULL, 12, x, y + 22); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_NONE, NULL, COLOUR_DARK_GREEN, x, y + 22); } // Properties // Raise / lower label y = w->y + w->widgets[WIDX_LARGE_SCENERY_SPINNER_HEIGHT].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, COLOUR_DARK_GREEN, x, y); // Current base height x = w->x + w->widgets[WIDX_LARGE_SCENERY_SPINNER_HEIGHT].left + 3; int baseHeight = mapElement->base_height; - gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x, y); + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); break; } @@ -2019,26 +2019,26 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { const uint8 bannerIndex = mapElement->properties.banner.index; if (gBanners[bannerIndex].flags & BANNER_FLAG_NO_ENTRY) { rct_string_id noEntryStringIdx = STR_NO_ENTRY; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, &noEntryStringIdx, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, &noEntryStringIdx, COLOUR_DARK_GREEN, x, y); } else { - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, &gBanners[bannerIndex].string_idx, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_ENTRY_BANNER_TEXT, &gBanners[bannerIndex].string_idx, COLOUR_DARK_GREEN, x, y); } // Properties // Raise / lower label y = w->y + w->widgets[WIDX_BANNER_SPINNER_HEIGHT].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, COLOUR_DARK_GREEN, x, y); // Current base height x = w->x + w->widgets[WIDX_BANNER_SPINNER_HEIGHT].left + 3; int baseHeight = mapElement->base_height; - gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x, y); + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); // Blocked paths y += 28; x = w->x + w->widgets[WIDX_GROUPBOX_DETAILS].left + 7; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BANNER_BLOCKED_PATHS, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BANNER_BLOCKED_PATHS, NULL, COLOUR_DARK_GREEN, x, y); break; } @@ -2047,12 +2047,12 @@ static void window_tile_inspector_paint(rct_window *w, rct_drawpixelinfo *dpi) { // Properties // Raise / lower label y = w->y + w->widgets[WIDX_CORRUPT_SPINNER_HEIGHT].top; - gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, 12, x, y); + gfx_draw_string_left(dpi, STR_TILE_INSPECTOR_BASE_HEIGHT_FULL, NULL, COLOUR_DARK_GREEN, x, y); // Current base height x = w->x + w->widgets[WIDX_CORRUPT_SPINNER_HEIGHT].left + 3; int baseHeight = mapElement->base_height; - gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x, y); + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x, y); break; } } // switch page @@ -2139,9 +2139,9 @@ static void window_tile_inspector_scrollpaint(rct_window *w, rct_drawpixelinfo * const bool broken = (mapElement->flags & MAP_ELEMENT_FLAG_BROKEN) != 0; const bool last = (mapElement->flags & MAP_ELEMENT_FLAG_LAST_TILE) != 0; gfx_clip_string(buffer, w->widgets[WIDX_COLUMN_TYPE].right - w->widgets[WIDX_COLUMN_TYPE].left - COL_X_TYPE); - gfx_draw_string(dpi, typeName, 12, x + COL_X_TYPE + 3, y); // 3px padding - gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, 12, x + COL_X_BH, y); - gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &clearanceHeight, 12, x + COL_X_CH, y); + gfx_draw_string(dpi, typeName, COLOUR_DARK_GREEN, x + COL_X_TYPE + 3, y); // 3px padding + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &baseHeight, COLOUR_DARK_GREEN, x + COL_X_BH, y); + gfx_draw_string_left(dpi, STR_FORMAT_INTEGER, &clearanceHeight, COLOUR_DARK_GREEN, x + COL_X_CH, y); if (ghost) gfx_draw_string(dpi, (char*)CheckBoxMarkString, w->colours[1], x + COL_X_GF, y); if (broken) gfx_draw_string(dpi, (char*)CheckBoxMarkString, w->colours[1], x + COL_X_BF, y); if (last) gfx_draw_string(dpi, (char*)CheckBoxMarkString, w->colours[1], x + COL_X_LF, y); diff --git a/src/windows/title_scenarioselect.c b/src/windows/title_scenarioselect.c index 0ebb5b11c8..4a9af42320 100644 --- a/src/windows/title_scenarioselect.c +++ b/src/windows/title_scenarioselect.c @@ -386,7 +386,7 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi) } else { // old-style set_format_arg(0, rct_string_id, ScenarioCategoryStringIds[i]); } - gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, 87, format, 10); + gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, 87, format, COLOUR_AQUAMARINE); } // Return if no scenario highlighted @@ -491,7 +491,7 @@ static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo * rct_string_id format = isDisabled ? STR_STRINGID : (isHighlighted ? highlighted_format : unhighlighted_format); set_format_arg(0, rct_string_id, STR_STRING); set_format_arg(2, char *, buffer); - colour = isDisabled ? w->colours[1] | 0x40 : COLOUR_BLACK; + colour = isDisabled ? w->colours[1] | COLOUR_FLAG_INSET : COLOUR_BLACK; if (isDisabled) { gCurrentFontSpriteBase = -1; }