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

Use constant for black strings

This commit is contained in:
Marijn van der Werf 2016-11-13 18:20:30 +01:00 committed by Ted John
parent c50ba73c3e
commit 022b481d66
46 changed files with 224 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/drawing/string.c
View File

@ -553,7 +553,7 @@ void draw_string_centred_underline(rct_drawpixelinfo *dpi, rct_string_id format,
void draw_string_centred_raw(rct_drawpixelinfo *dpi, int x, int y, int numLines, char *text)
{
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
gfx_draw_string(dpi, "", 0, dpi->x, dpi->y);
gfx_draw_string(dpi, "", COLOUR_BLACK, dpi->x, dpi->y);
gCurrentFontFlags = 0;
for (int i = 0; i <= numLines; i++) {

4
src/interface/graph.c
View File

@ -31,7 +31,7 @@ static void graph_draw_months_uint8(rct_drawpixelinfo *dpi, uint8 *history, int
if (history[i] != 0 && history[i] != 255 && yearOver32 % 4 == 0) {
// Draw month text
set_format_arg(0, uint32, DateGameShortMonthNames[((yearOver32 / 4) + 8) % 8]);
gfx_draw_string_centred(dpi, STR_GRAPH_LABEL, x, y - 10, 0, gCommonFormatArgs);
gfx_draw_string_centred(dpi, STR_GRAPH_LABEL, x, y - 10, COLOUR_BLACK, gCommonFormatArgs);
// Draw month mark
gfx_fill_rect(dpi, x, y, x, y + 3, 10);
@ -109,7 +109,7 @@ static void graph_draw_months_money32(rct_drawpixelinfo *dpi, money32 *history,
if (history[i] != 0x80000000 && yearOver32 % 4 == 0) {
// Draw month text
sint32 monthFormat = DateGameShortMonthNames[((yearOver32 / 4) + 8) % 8];
gfx_draw_string_centred(dpi, STR_GRAPH_LABEL, x, y - 10, 0, &monthFormat);
gfx_draw_string_centred(dpi, STR_GRAPH_LABEL, x, y - 10, COLOUR_BLACK, &monthFormat);
// Draw month mark
gfx_fill_rect(dpi, x, y, x, y + 3, 10);

8
src/interface/widget.c
View File

@ -781,7 +781,7 @@ static void widget_hscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i
// Left button
gfx_fill_rect_inset(dpi, l, t, l + 9, b, colour, (scroll->flags & HSCROLLBAR_LEFT_PRESSED ? INSET_RECT_FLAG_BORDER_INSET : 0));
gfx_draw_string(dpi, (char*)BlackLeftArrowString, 0, l + 1, t);
gfx_draw_string(dpi, (char*)BlackLeftArrowString, COLOUR_BLACK, l + 1, t);
// Thumb
gfx_fill_rect_inset(dpi,
@ -791,7 +791,7 @@ static void widget_hscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i
// Right button
gfx_fill_rect_inset(dpi, r - 9, t, r, b, colour, (scroll->flags & HSCROLLBAR_RIGHT_PRESSED ? INSET_RECT_FLAG_BORDER_INSET : 0));
gfx_draw_string(dpi, (char*)BlackRightArrowString, 0, r - 6, t);
gfx_draw_string(dpi, (char*)BlackRightArrowString, COLOUR_BLACK, r - 6, t);
}
static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, int l, int t, int r, int b, int colour)
@ -807,7 +807,7 @@ static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i
// Up button
gfx_fill_rect_inset(dpi, l, t, r, t + 9, colour, (scroll->flags & VSCROLLBAR_UP_PRESSED ? INSET_RECT_FLAG_BORDER_INSET : 0));
gfx_draw_string(dpi, (char*)BlackUpArrowString, 0, l + 1, t - 1);
gfx_draw_string(dpi, (char*)BlackUpArrowString, COLOUR_BLACK, l + 1, t - 1);
// Thumb
gfx_fill_rect_inset(dpi,
@ -817,7 +817,7 @@ static void widget_vscrollbar_draw(rct_drawpixelinfo *dpi, rct_scroll *scroll, i
// Down button
gfx_fill_rect_inset(dpi, l, b - 9, r, b, colour, (scroll->flags & VSCROLLBAR_DOWN_PRESSED ? INSET_RECT_FLAG_BORDER_INSET : 0));
gfx_draw_string(dpi, (char*)BlackDownArrowString, 0, l + 1, b - 9);
gfx_draw_string(dpi, (char*)BlackDownArrowString, COLOUR_BLACK, l + 1, b - 9);
}
/**

2
src/object/StexObject.cpp
View File

@ -64,7 +64,7 @@ void StexObject::DrawPreview(rct_drawpixelinfo * dpi, sint32 width, sint32 heigh
// Write (no image)
sint32 x = width / 2;
sint32 y = height / 2;
gfx_draw_string_centred(dpi, STR_WINDOW_NO_IMAGE, x, y, 0, nullptr);
gfx_draw_string_centred(dpi, STR_WINDOW_NO_IMAGE, x, y, COLOUR_BLACK, nullptr);
}
const utf8 * StexObject::GetName() const

2
src/object/WaterObject.cpp
View File

@ -63,5 +63,5 @@ void WaterObject::DrawPreview(rct_drawpixelinfo * dpi, sint32 width, sint32 heig
// Write (no image)
sint32 x = width / 2;
sint32 y = height / 2;
gfx_draw_string_centred(dpi, STR_WINDOW_NO_IMAGE, x, y, 0, nullptr);
gfx_draw_string_centred(dpi, STR_WINDOW_NO_IMAGE, x, y, COLOUR_BLACK, nullptr);
}

2
src/paint/paint.c
View File

@ -1057,6 +1057,6 @@ void paint_draw_money_structs(rct_drawpixelinfo * dpi, paint_string_struct * ps)
forceSpriteFont = true;
}
gfx_draw_string_with_y_offsets(&dpi2, buffer, 0, ps->x, ps->y, (sint8 *)ps->y_offsets, forceSpriteFont);
gfx_draw_string_with_y_offsets(&dpi2, buffer, COLOUR_BLACK, ps->x, ps->y, (sint8 *)ps->y_offsets, forceSpriteFont);
} while ((ps = ps->next) != NULL);
}

4
src/title.c
View File

@ -503,11 +503,11 @@ void DrawOpenRCT2(rct_drawpixelinfo *dpi, int x, int y)
// Write name and version information
openrct2_write_full_version_info(ch, sizeof(buffer) - (ch - buffer));
gfx_draw_string(dpi, buffer, 0, x + 5, y + 5 - 13);
gfx_draw_string(dpi, buffer, COLOUR_BLACK, x + 5, y + 5 - 13);
// Write platform information
snprintf(ch, 256 - (ch - buffer), "%s (%s)", OPENRCT2_PLATFORM, OPENRCT2_ARCHITECTURE);
gfx_draw_string(dpi, buffer, 0, x + 5, y + 5);
gfx_draw_string(dpi, buffer, COLOUR_BLACK, x + 5, y + 5);
}

34
src/windows/about.c
View File

@ -133,44 +133,44 @@ static void window_about_paint(rct_window *w, rct_drawpixelinfo *dpi)
y = w->y + 17;
// Version
gfx_draw_string_centred(dpi, STR_VERSION_X, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_VERSION_X, x, y, COLOUR_BLACK, NULL);
// Credits
y += 10;
gfx_draw_string_centred(dpi, STR_COPYRIGHT_CS, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_COPYRIGHT_CS, x, y, COLOUR_BLACK, NULL);
y += 79;
gfx_draw_string_centred(dpi, STR_DESIGNED_AND_PROGRAMMED_BY_CS, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_DESIGNED_AND_PROGRAMMED_BY_CS, x, y, COLOUR_BLACK, NULL);
y += 10;
gfx_draw_string_centred(dpi, STR_GRAPHICS_BY_SF, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_GRAPHICS_BY_SF, x, y, COLOUR_BLACK, NULL);
y += 10;
gfx_draw_string_centred(dpi, STR_SOUND_AND_MUSIC_BY_AB, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_SOUND_AND_MUSIC_BY_AB, x, y, COLOUR_BLACK, NULL);
y += 10;
gfx_draw_string_centred(dpi, STR_ADDITIONAL_SOUNDS_RECORDED_BY_DE, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_ADDITIONAL_SOUNDS_RECORDED_BY_DE, x, y, COLOUR_BLACK, NULL);
y += 13;
gfx_draw_string_centred(dpi, STR_REPRESENTATION_BY_JL, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_REPRESENTATION_BY_JL, x, y, COLOUR_BLACK, NULL);
y += 25;
gfx_draw_string_centred(dpi, STR_THANKS_TO, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_THANKS_TO, x, y, COLOUR_BLACK, NULL);
y += 10;
gfx_draw_string_centred(dpi, STR_THANKS_TO_PEOPLE, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_THANKS_TO_PEOPLE, x, y, COLOUR_BLACK, NULL);
y += 10;
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_1, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_1, x, y, COLOUR_BLACK, NULL);
y += 10;
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_2, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_2, x, y, COLOUR_BLACK, NULL);
y += 10;
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_3, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_3, x, y, COLOUR_BLACK, NULL);
y += 10;
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_4, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_4, x, y, COLOUR_BLACK, NULL);
y += 10;
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_5, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_5, x, y, COLOUR_BLACK, NULL);
y += 10;
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_6, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_6, x, y, COLOUR_BLACK, NULL);
y += 10;
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_7, x, y, 0, NULL);
gfx_draw_string_centred(dpi, STR_CREDIT_SPARE_7, x, y, COLOUR_BLACK, NULL);
// Images
gfx_draw_sprite(dpi, SPR_CREDITS_CHRIS_SAWYER_SMALL, w->x + 92, w->y + 40, 0);
gfx_draw_sprite(dpi, SPR_CREDITS_INFOGRAMES, w->x + 50, w->y + 247, 0);
// Licence
gfx_draw_string_left(dpi, STR_LICENSED_TO_INFOGRAMES_INTERACTIVE_INC, 0, 0, w->x + 157, w->y + 257);
gfx_draw_string_left(dpi, STR_LICENSED_TO_INFOGRAMES_INTERACTIVE_INC, NULL, COLOUR_BLACK, w->x + 157, w->y + 257);
}

24
src/windows/cheats.c
View File

@ -862,23 +862,23 @@ static void window_cheats_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (w->page == WINDOW_CHEATS_PAGE_MONEY){
set_format_arg(0, money32, CHEATS_MONEY_INCREMENT);
gfx_draw_string_left(dpi, STR_CHEAT_5K_MONEY_TIP, gCommonFormatArgs, 0, w->x + XPL(0) + TXTO, w->y + YPL(0) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_CLEAR_LOAN_TIP, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_5K_MONEY_TIP, gCommonFormatArgs, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(0) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_CLEAR_LOAN_TIP, NULL, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO);
}
else if(w->page == WINDOW_CHEATS_PAGE_MISC){
gfx_draw_string_left(dpi, STR_CHEAT_STAFF_SPEED, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(16) + TXTO);
gfx_draw_string_left(dpi, STR_FORCE_WEATHER, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(9) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_STAFF_SPEED, NULL, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(16) + TXTO);
gfx_draw_string_left(dpi, STR_FORCE_WEATHER, NULL, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(9) + TXTO);
gfx_draw_string_right(dpi, STR_FORMAT_INTEGER, &park_rating_spinner_value, w->colours[2], w->x + WPL(1) - 10 - TXTO, w->y + YPL(4) + TXTO);
}
else if (w->page == WINDOW_CHEATS_PAGE_GUESTS){
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_HAPPINESS, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(1) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_ENERGY, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_HUNGER, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(3) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_THIRST, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(4) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_NAUSEA, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(5) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_NAUSEA_TOLERANCE, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(6) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_BATHROOM, NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(7) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_PREFERRED_INTENSITY,NULL, 0, w->x + XPL(0) + TXTO, w->y + YPL(8) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_HAPPINESS, NULL, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(1) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_ENERGY, NULL, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(2) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_HUNGER, NULL, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(3) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_THIRST, NULL, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(4) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_NAUSEA, NULL, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(5) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_NAUSEA_TOLERANCE, NULL, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(6) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_BATHROOM, NULL, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(7) + TXTO);
gfx_draw_string_left(dpi, STR_CHEAT_GUEST_PREFERRED_INTENSITY,NULL, COLOUR_BLACK, w->x + XPL(0) + TXTO, w->y + YPL(8) + TXTO);
}
}

4
src/windows/clear_scenery.c
View File

@ -239,7 +239,7 @@ static void window_clear_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi)
x = w->x + (window_clear_scenery_widgets[WIDX_PREVIEW].left + window_clear_scenery_widgets[WIDX_PREVIEW].right) / 2;
y = w->y + (window_clear_scenery_widgets[WIDX_PREVIEW].top + window_clear_scenery_widgets[WIDX_PREVIEW].bottom) / 2;
if (gLandToolSize > 7) {
gfx_draw_string_centred(dpi, STR_LAND_TOOL_SIZE_VALUE, x, y - 2, 0, &gLandToolSize);
gfx_draw_string_centred(dpi, STR_LAND_TOOL_SIZE_VALUE, x, y - 2, COLOUR_BLACK, &gLandToolSize);
}
// Draw cost amount
@ -248,7 +248,7 @@ static void window_clear_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (gClearSceneryCost != MONEY32_UNDEFINED &&
gClearSceneryCost != 0
) {
gfx_draw_string_centred(dpi, STR_COST_AMOUNT, x, y, 0, &gClearSceneryCost);
gfx_draw_string_centred(dpi, STR_COST_AMOUNT, x, y, COLOUR_BLACK, &gClearSceneryCost);
}
}

2
src/windows/demolish_ride_prompt.c
View File

@ -137,5 +137,5 @@ static void window_ride_demolish_paint(rct_window *w, rct_drawpixelinfo *dpi)
int x = w->x + WW / 2;
int y = w->y + (WH / 2) - 3;
gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, WW - 4, STR_DEMOLISH_RIDE_ID, 0);
gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, WW - 4, STR_DEMOLISH_RIDE_ID, COLOUR_BLACK);
}

4
src/windows/editor_inventions_list.c
View File

@ -819,7 +819,7 @@ static void window_editor_inventions_list_paint(rct_window *w, rct_drawpixelinfo
y = w->y + widget->bottom + 3;
width = w->width - w->widgets[WIDX_RESEARCH_ORDER_SCROLL].right - 6;
stringId = research_item_get_name(eax);
gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRINGID, &stringId, 0, x, y, width);
gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRINGID, &stringId, COLOUR_BLACK, x, y, width);
y += 15;
// Item category
@ -905,7 +905,7 @@ static void window_editor_inventions_list_scrollpaint(rct_window *w, rct_drawpix
colour = 64 | w->colours[1];
} else {
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
colour = 0;
colour = COLOUR_BLACK;
}
left = 1;

8
src/windows/editor_object_selection.c
View File

@ -1343,7 +1343,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
width = w->width - w->widgets[WIDX_LIST].right - 6;
set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, const char *, listItem->repositoryItem->Name);
gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, 0, x, y, width);
gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, x, y, width);
// Draw description of object
const char *description = object_get_description(_loadedObject);
@ -1355,9 +1355,9 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
y += 15;
int width = w->x + w->width - x - 4;
if (type == OBJECT_TYPE_SCENARIO_TEXT) {
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_OBJECT_SELECTION_DESCRIPTION_SCENARIO_TEXT, 0);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_OBJECT_SELECTION_DESCRIPTION_SCENARIO_TEXT, COLOUR_BLACK);
} else {
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y + 5, width, STR_WINDOW_COLOUR_2_STRINGID, 0);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y + 5, width, STR_WINDOW_COLOUR_2_STRINGID, COLOUR_BLACK);
}
}
@ -1386,7 +1386,7 @@ static void window_editor_object_selection_paint(rct_window *w, rct_drawpixelinf
const char *path = path_get_filename(listItem->repositoryItem->Path);
set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, const char *, path);
gfx_draw_string_right(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, 0, w->x + w->width - 5, w->y + w->height - 3 - 12);
gfx_draw_string_right(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, w->x + w->width - 5, w->y + w->height - 3 - 12);
}
/**

6
src/windows/editor_objective_options.c
View File

@ -1002,7 +1002,7 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi
set_format_arg(0, rct_string_id, gParkName);
}
set_format_arg(2, uint32, gParkNameArgs);
gfx_draw_string_left_clipped(dpi, STR_WINDOW_PARK_NAME, gCommonFormatArgs, 0, x, y, width);
gfx_draw_string_left_clipped(dpi, STR_WINDOW_PARK_NAME, gCommonFormatArgs, COLOUR_BLACK, x, y, width);
// Scenario name
x = w->x + 8;
@ -1017,7 +1017,7 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi
set_format_arg(2, const char *, gS6Info.name);
}
gfx_draw_string_left_clipped(dpi, STR_WINDOW_SCENARIO_NAME, gCommonFormatArgs, 0, x, y, width);
gfx_draw_string_left_clipped(dpi, STR_WINDOW_SCENARIO_NAME, gCommonFormatArgs, COLOUR_BLACK, x, y, width);
// Scenario details label
x = w->x + 8;
@ -1036,7 +1036,7 @@ static void window_editor_objective_options_main_paint(rct_window *w, rct_drawpi
set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, const char *, gS6Info.details);
}
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_BLACK_STRING, 0);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_BLACK_STRING, COLOUR_BLACK);
// Scenario category label
x = w->x + 8;

16
src/windows/finances.c
View File

@ -670,7 +670,7 @@ static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi)
y = w->y + 47;
// Expenditure / Income heading
draw_string_left_underline(dpi, STR_FINANCES_SUMMARY_EXPENDITURE_INCOME, NULL, 0, x, y - 1);
draw_string_left_underline(dpi, STR_FINANCES_SUMMARY_EXPENDITURE_INCOME, NULL, COLOUR_BLACK, x, y - 1);
y += 14;
// Expenditure / Income row labels
@ -700,7 +700,7 @@ static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi)
dpi,
monthyear == currentMonthYear ? STR_WINDOW_COLOUR_2_STRINGID : STR_BLACK_STRING,
gCommonFormatArgs,
0,
COLOUR_BLACK,
x + 80,
y - 1
);
@ -717,7 +717,7 @@ static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi)
dpi,
expenditure >= 0 ? STR_FINANCES_SUMMARY_INCOME_VALUE : STR_FINANCES_SUMMARY_EXPENDITURE_VALUE,
&expenditure,
0,
COLOUR_BLACK,
x + 80,
y - 1
);
@ -731,7 +731,7 @@ static void window_finances_summary_paint(rct_window *w, rct_drawpixelinfo *dpi)
dpi,
profit >= 0 ? STR_FINANCES_SUMMARY_INCOME_VALUE : STR_FINANCES_SUMMARY_LOSS_VALUE,
&profit,
0,
COLOUR_BLACK,
x + 80,
y - 1
);
@ -866,7 +866,7 @@ static void window_finances_financial_graph_paint(rct_window *w, rct_drawpixelin
money32 axisBase;
for (axisBase = MONEY(12,00); axisBase >= MONEY(-12,00); axisBase -= MONEY(6,00)) {
money32 axisValue = axisBase << yAxisScale;
gfx_draw_string_right(dpi, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, &axisValue, 0, x + 70, y);
gfx_draw_string_right(dpi, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, &axisValue, COLOUR_BLACK, x + 70, y);
y += 39;
}
@ -972,7 +972,7 @@ static void window_finances_park_value_graph_paint(rct_window *w, rct_drawpixeli
money32 axisBase;
for (axisBase = MONEY(24,00); axisBase >= MONEY(0,00); axisBase -= MONEY(6,00)) {
money32 axisValue = axisBase << yAxisScale;
gfx_draw_string_right(dpi, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, &axisValue, 0, x + 70, y);
gfx_draw_string_right(dpi, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, &axisValue, COLOUR_BLACK, x + 70, y);
y += 39;
}
@ -1078,7 +1078,7 @@ static void window_finances_profit_graph_paint(rct_window *w, rct_drawpixelinfo
money32 axisBase;
for (axisBase = MONEY(12,00); axisBase >= MONEY(-12,00); axisBase -= MONEY(6,00)) {
money32 axisValue = axisBase << yAxisScale;
gfx_draw_string_right(dpi, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, &axisValue, 0, x + 70, y);
gfx_draw_string_right(dpi, STR_FINANCES_FINANCIAL_GRAPH_CASH_VALUE, &axisValue, COLOUR_BLACK, x + 70, y);
y += 39;
}
@ -1205,7 +1205,7 @@ static void window_finances_marketing_paint(rct_window *w, rct_drawpixelinfo *dp
}
// Advertisement
gfx_draw_string_left_clipped(dpi, MarketingCampaignNames[i][1], gCommonFormatArgs, 0, x + 4, y, 296);
gfx_draw_string_left_clipped(dpi, MarketingCampaignNames[i][1], gCommonFormatArgs, COLOUR_BLACK, x + 4, y, 296);
// Duration
weeksRemaining = (gMarketingCampaignDaysLeft[i] % 128);

4
src/windows/footpath.c
View File

@ -619,7 +619,7 @@ static void window_footpath_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Draw build this... label
x = w->x + (window_footpath_widgets[WIDX_CONSTRUCT].left + window_footpath_widgets[WIDX_CONSTRUCT].right) / 2;
y = w->y + window_footpath_widgets[WIDX_CONSTRUCT].bottom - 23;
gfx_draw_string_centred(dpi, STR_BUILD_THIS, x, y, 0, 0);
gfx_draw_string_centred(dpi, STR_BUILD_THIS, x, y, COLOUR_BLACK, NULL);
}
// Draw cost
@ -627,7 +627,7 @@ static void window_footpath_paint(rct_window *w, rct_drawpixelinfo *dpi)
y = w->y + window_footpath_widgets[WIDX_CONSTRUCT].bottom - 12;
if (_window_footpath_cost != MONEY32_UNDEFINED)
if (!(gParkFlags & PARK_FLAGS_NO_MONEY))
gfx_draw_string_centred(dpi, STR_COST_LABEL, x, y, 0, &_window_footpath_cost);
gfx_draw_string_centred(dpi, STR_COST_LABEL, x, y, COLOUR_BLACK, &_window_footpath_cost);
}
/**

8
src/windows/guest.c
View File

@ -1012,7 +1012,7 @@ void window_guest_overview_paint(rct_window *w, rct_drawpixelinfo *dpi)
int x = (widget->left + widget->right) / 2 + w->x;
int y = w->y + widget->top - 1;
int width = widget->right - widget->left;
gfx_draw_string_centred_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, 0, x, y, width);
gfx_draw_string_centred_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, x, y, width);
// Draw the marquee thought
widget = &w->widgets[WIDX_MARQUEE];
@ -1690,7 +1690,7 @@ void window_guest_rides_paint(rct_window *w, rct_drawpixelinfo *dpi)
set_format_arg(0, rct_string_id, ride_string_id);
set_format_arg(2, uint32, ride_string_arguments);
gfx_draw_string_left_clipped(dpi, STR_FAVOURITE_RIDE, gCommonFormatArgs, 0, x, y, w->width - 14);
gfx_draw_string_left_clipped(dpi, STR_FAVOURITE_RIDE, gCommonFormatArgs, COLOUR_BLACK, x, y, w->width - 14);
}
/**
@ -1955,7 +1955,7 @@ void window_guest_thoughts_paint(rct_window *w, rct_drawpixelinfo *dpi)
- 8;
peep_thought_set_format_args(thought);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_BLACK_STRING, 0);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_BLACK_STRING, COLOUR_BLACK);
// If this is the last visible line end drawing.
if (y > w->y + window_guest_thoughts_widgets[WIDX_PAGE_BACKGROUND].bottom - 32) return;
@ -2129,7 +2129,7 @@ void window_guest_inventory_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (!peep_has_item(peep, item)) continue;
rct_string_id stringId = window_guest_inventory_format_item(peep, item);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, itemNameWidth, stringId, 0);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, itemNameWidth, stringId, COLOUR_BLACK);
numItems++;
}

12
src/windows/guest_list.c
View File

@ -674,7 +674,7 @@ static void window_guest_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
} else {
format = STR_ALL_GUESTS_SUMMARISED;
}
gfx_draw_string_left_clipped(dpi, format, _window_guest_list_filter_arguments, 0, x, y, 310);
gfx_draw_string_left_clipped(dpi, format, _window_guest_list_filter_arguments, COLOUR_BLACK, x, y, 310);
// Number of guests (list items)
if (_window_guest_list_selected_tab == PAGE_INDIVIDUAL) {
@ -735,7 +735,7 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
// Guest name
set_format_arg(0, rct_string_id, peep->name_string_idx);
set_format_arg(2, uint32, peep->id);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, 0, 0, y - 1, 113);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, COLOUR_BLACK, 0, y - 1, 113);
switch (_window_guest_list_selected_view) {
case VIEW_ACTIONS:
@ -752,7 +752,7 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
set_format_arg(0, uint32, argument_1);
set_format_arg(4, uint32, argument_2);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, 0, 133, y - 1, 314);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, COLOUR_BLACK, 133, y - 1, 314);
break;
case VIEW_THOUGHTS:
// For each thought
@ -766,7 +766,7 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
break;
peep_thought_set_format_args(&peep->thoughts[j]);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, 0, 118, y - 1, 329);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, COLOUR_BLACK, 118, y - 1, 329);
break;
}
break;
@ -805,11 +805,11 @@ static void window_guest_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
set_format_arg(0, uint32, _window_guest_list_groups_argument_1[i]);
set_format_arg(4, uint32, _window_guest_list_groups_argument_2[i]);
set_format_arg(10, uint32, numGuests);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, 0, 0, y - 1, 414);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, COLOUR_BLACK, 0, y - 1, 414);
// Draw guest count
set_format_arg(8, rct_string_id, STR_GUESTS_COUNT_COMMA_SEP);
gfx_draw_string_right(dpi, format, gCommonFormatArgs + 8, 0, 326, y - 1);
gfx_draw_string_right(dpi, format, gCommonFormatArgs + 8, COLOUR_BLACK, 326, y - 1);
}
y += 21;
}

6
src/windows/install_track.c
View File

@ -240,13 +240,13 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (td6->track_flags & 1) {
if (!gTrackDesignSceneryToggle) {
// Scenery not available
gfx_draw_string_centred_clipped(dpi, STR_DESIGN_INCLUDES_SCENERY_WHICH_IS_UNAVAILABLE, NULL, 0, x, y, 368);
gfx_draw_string_centred_clipped(dpi, STR_DESIGN_INCLUDES_SCENERY_WHICH_IS_UNAVAILABLE, NULL, COLOUR_BLACK, x, y, 368);
y -= 10;
}
}
// Track design name
gfx_draw_string_centred_clipped(dpi, STR_TRACK_PREVIEW_NAME_FORMAT, &_trackName, 0, x, y, 368);
gfx_draw_string_centred_clipped(dpi, STR_TRACK_PREVIEW_NAME_FORMAT, &_trackName, COLOUR_BLACK, x, y, 368);
// Information
x = w->x + widget->left + 1;
@ -288,7 +288,7 @@ static void window_install_track_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Ride length
set_format_arg(0, rct_string_id, STR_RIDE_LENGTH_ENTRY);
set_format_arg(2, uint16, td6->ride_length);
gfx_draw_string_left_clipped(dpi, STR_TRACK_LIST_RIDE_LENGTH, gCommonFormatArgs, 0, x, y, 214);
gfx_draw_string_left_clipped(dpi, STR_TRACK_LIST_RIDE_LENGTH, gCommonFormatArgs, COLOUR_BLACK, x, y, 214);
y += 10;
}

8
src/windows/land.c
View File

@ -371,7 +371,7 @@ static void window_land_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (gLandToolSize > 7) {
x = w->x + (previewWidget->left + previewWidget->right) / 2;
y = w->y + (previewWidget->top + previewWidget->bottom) / 2;
gfx_draw_string_centred(dpi, STR_LAND_TOOL_SIZE_VALUE, x, y - 2, 0, &gLandToolSize);
gfx_draw_string_centred(dpi, STR_LAND_TOOL_SIZE_VALUE, x, y - 2, COLOUR_BLACK, &gLandToolSize);
} else if (gLandMountainMode) {
x = w->x + previewWidget->left;
y = w->y + previewWidget->top;
@ -383,12 +383,12 @@ static void window_land_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Draw raise cost amount
if (gLandToolRaiseCost != MONEY32_UNDEFINED && gLandToolRaiseCost != 0)
gfx_draw_string_centred(dpi, STR_RAISE_COST_AMOUNT, x, y, 0, &gLandToolRaiseCost);
gfx_draw_string_centred(dpi, STR_RAISE_COST_AMOUNT, x, y, COLOUR_BLACK, &gLandToolRaiseCost);
y += 10;
// Draw lower cost amount
if (gLandToolLowerCost != MONEY32_UNDEFINED && gLandToolLowerCost != 0)
gfx_draw_string_centred(dpi, STR_LOWER_COST_AMOUNT, x, y, 0, &gLandToolLowerCost);
gfx_draw_string_centred(dpi, STR_LOWER_COST_AMOUNT, x, y, COLOUR_BLACK, &gLandToolLowerCost);
y += 50;
// Draw paint price
@ -401,6 +401,6 @@ static void window_land_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (price != 0 && !(gParkFlags & PARK_FLAGS_NO_MONEY)) {
set_format_arg(0, money32, price);
gfx_draw_string_centred(dpi, STR_COST_AMOUNT, x, y, 0, gCommonFormatArgs);
gfx_draw_string_centred(dpi, STR_COST_AMOUNT, x, y, COLOUR_BLACK, gCommonFormatArgs);
}
}

4
src/windows/land_rights.c
View File

@ -237,7 +237,7 @@ static void window_land_rights_paint(rct_window *w, rct_drawpixelinfo *dpi)
window_draw_widgets(w, dpi);
// Draw number for tool sizes bigger than 7
if (gLandToolSize > 7) {
gfx_draw_string_centred(dpi, STR_LAND_TOOL_SIZE_VALUE, x, y - 2, 0, &gLandToolSize);
gfx_draw_string_centred(dpi, STR_LAND_TOOL_SIZE_VALUE, x, y - 2, COLOUR_BLACK, &gLandToolSize);
}
y = w->y + window_land_rights_widgets[WIDX_PREVIEW].bottom + 5;
@ -247,7 +247,7 @@ static void window_land_rights_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (gLandRightsCost != MONEY32_UNDEFINED &&
gLandRightsCost != 0
) {
gfx_draw_string_centred(dpi, STR_COST_AMOUNT, x, y, 0, &gLandRightsCost);
gfx_draw_string_centred(dpi, STR_COST_AMOUNT, x, y, COLOUR_BLACK, &gLandRightsCost);
}
}

4
src/windows/loadsave.c
View File

@ -488,7 +488,7 @@ static void window_loadsave_paint(rct_window *w, rct_drawpixelinfo *dpi)
safe_strcpy(ch, _shortenedDirectory, sizeof(buffer) - (ch - buffer));
// Draw shadow
gfx_draw_string(dpi, buffer, 0, w->x + 4, w->y + 20);
gfx_draw_string(dpi, buffer, COLOUR_BLACK, w->x + 4, w->y + 20);
rct_string_id id = STR_NONE;
// Name button text
if (gConfigGeneral.load_save_sort == SORT_NAME_ASCENDING)
@ -971,7 +971,7 @@ static void window_overwrite_prompt_paint(rct_window *w, rct_drawpixelinfo *dpi)
int x = w->x + w->width / 2;
int y = w->y + (w->height / 2) - 3;
gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, w->width - 4, STR_FILEBROWSER_OVERWRITE_PROMPT, 0);
gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, w->width - 4, STR_FILEBROWSER_OVERWRITE_PROMPT, COLOUR_BLACK);
}

2
src/windows/map.c
View File

@ -822,7 +822,7 @@ static void window_map_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Draw land tool size
if (widget_is_active_tool(w, WIDX_SET_LAND_RIGHTS) && gLandToolSize > 7) {
gfx_draw_string_centred(dpi, STR_LAND_TOOL_SIZE_VALUE, x, y - 2, 0, &gLandToolSize);
gfx_draw_string_centred(dpi, STR_LAND_TOOL_SIZE_VALUE, x, y - 2, COLOUR_BLACK, &gLandToolSize);
}
y = w->y + window_map_widgets[WIDX_LAND_TOOL].bottom + 5;

2
src/windows/map_tooltip.c
View File

@ -151,5 +151,5 @@ static void window_map_tooltip_paint(rct_window *w, rct_drawpixelinfo *dpi)
return;
}
gfx_draw_string_centred_wrapped(dpi, gMapTooltipFormatArgs, w->x + (w->width / 2), w->y + (w->height / 2), w->width, STR_MAP_TOOLTIP_STRINGID, 0);
gfx_draw_string_centred_wrapped(dpi, gMapTooltipFormatArgs, w->x + (w->width / 2), w->y + (w->height / 2), w->width, STR_MAP_TOOLTIP_STRINGID, COLOUR_BLACK);
}

10
src/windows/multiplayer.c
View File

@ -607,7 +607,7 @@ static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixeli
// Draw player name
char* lineCh = buffer;
int colour = 0;
int colour = COLOUR_BLACK;
if (i == w->selected_list_item) {
gfx_filter_rect(dpi, 0, y, 800, y + 9, PALETTE_DARKEN_1);
safe_strcpy(buffer, network_get_player_name(i), sizeof(buffer));
@ -639,7 +639,7 @@ static void window_multiplayer_players_scrollpaint(rct_window *w, rct_drawpixeli
if (action != -999) {
set_format_arg(0, rct_string_id, network_get_action_name_string_id(action));
}
gfx_draw_string_left_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, 0, 256, y - 1, 100);
gfx_draw_string_left_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, 256, y - 1, 100);
// Draw ping
lineCh = buffer;
@ -829,7 +829,7 @@ static void window_multiplayer_groups_paint(rct_window *w, rct_drawpixelinfo *dp
dpi,
STR_STRING,
gCommonFormatArgs,
0,
COLOUR_BLACK,
w->x + (widget->left + widget->right - 11) / 2,
w->y + widget->top,
widget->right - widget->left - 8
@ -858,7 +858,7 @@ static void window_multiplayer_groups_paint(rct_window *w, rct_drawpixelinfo *dp
dpi,
STR_STRING,
gCommonFormatArgs,
0,
COLOUR_BLACK,
w->x + (widget->left + widget->right - 11) / 2,
w->y + widget->top,
widget->right - widget->left - 8
@ -889,7 +889,7 @@ static void window_multiplayer_groups_scrollpaint(rct_window *w, rct_drawpixelin
lineCh = buffer;
lineCh = utf8_write_codepoint(lineCh, FORMAT_WINDOW_COLOUR_2);
lineCh = utf8_write_codepoint(lineCh, FORMAT_TICK);
gfx_draw_string(dpi, buffer, 0, 0, y - 1);
gfx_draw_string(dpi, buffer, COLOUR_BLACK, 0, y - 1);
}
}

6
src/windows/music_credits.c
View File

@ -190,13 +190,13 @@ static void window_music_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *d
int y = 2;
for (int i = 0; i < countof(music_credits); i++) {
gfx_draw_string_centred(dpi, music_credits[i], x, y, 0, 0);
gfx_draw_string_centred(dpi, music_credits[i], x, y, COLOUR_BLACK, NULL);
y += 10;
}
// Add 4 more space before "Original recordings ...".
y += 4;
gfx_draw_string_centred(dpi, STR_MUSIC_ACKNOWLEDGEMENTS_ORIGINAL_RECORDINGS, x, y, 0, 0);
gfx_draw_string_centred(dpi, STR_MUSIC_ACKNOWLEDGEMENTS_ORIGINAL_RECORDINGS, x, y, COLOUR_BLACK, NULL);
y += 10;
// Draw the separator
@ -205,7 +205,7 @@ static void window_music_credits_scrollpaint(rct_window *w, rct_drawpixelinfo *d
y += 11;
for (int i = 0; i < countof(music_credits_rct2); i++) {
gfx_draw_string_centred(dpi, music_credits_rct2[i], x, y, 0, 0);
gfx_draw_string_centred(dpi, music_credits_rct2[i], x, y, COLOUR_BLACK, NULL);
y += 10;
}

2
src/windows/network_status.c
View File

@ -182,5 +182,5 @@ static void window_network_status_paint(rct_window *w, rct_drawpixelinfo *dpi)
int x = w->x + (w->width / 2);
int y = w->y + (w->height / 2);
x -= gfx_get_string_width(buffer) / 2;
gfx_draw_string(dpi, buffer, 0, x, y);
gfx_draw_string(dpi, buffer, COLOUR_BLACK, x, y);
}

4
src/windows/new_ride.c
View File

@ -879,7 +879,7 @@ static void window_new_ride_paint_ride_information(rct_window *w, rct_drawpixeli
set_format_arg(0, rct_string_id, rideName);
set_format_arg(2, rct_string_id, rideDescription);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_NEW_RIDE_NAME_AND_DESCRIPTION, 0);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, width, STR_NEW_RIDE_NAME_AND_DESCRIPTION, COLOUR_BLACK);
// Number of designs available
if (ride_type_has_flag(item.type, RIDE_TYPE_FLAG_HAS_TRACK)) {
@ -924,7 +924,7 @@ static void window_new_ride_paint_ride_information(rct_window *w, rct_drawpixeli
if (!ride_type_has_flag(item.type, RIDE_TYPE_FLAG_HAS_NO_TRACK))
stringId = STR_NEW_RIDE_COST_FROM;
gfx_draw_string_right(dpi, stringId, &price, 0, x + width, y + 39);
gfx_draw_string_right(dpi, stringId, &price, COLOUR_BLACK, x + width, y + 39);
}
}

14
src/windows/park.c
View File

@ -1070,7 +1070,7 @@ static void window_park_entrance_paint(rct_window *w, rct_drawpixelinfo *dpi)
dpi,
STR_BLACK_STRING,
gCommonFormatArgs,
0,
COLOUR_BLACK,
w->x + (labelWidget->left + labelWidget->right) / 2,
w->y + labelWidget->top,
labelWidget->right - labelWidget->left
@ -1781,7 +1781,7 @@ static void window_park_objective_paint(rct_window *w, rct_drawpixelinfo *dpi)
y = w->y + window_park_objective_widgets[WIDX_PAGE_BACKGROUND].top + 7;
set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, const char *, gScenarioDetails);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 222, STR_BLACK_STRING, 0);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 222, STR_BLACK_STRING, COLOUR_BLACK);
y += 5;
// Your objective:
@ -1793,18 +1793,18 @@ static void window_park_objective_paint(rct_window *w, rct_drawpixelinfo *dpi)
set_format_arg(2, short, date_get_total_months(MONTH_OCTOBER, gScenarioObjectiveYear));
set_format_arg(4, money32, gScenarioObjectiveCurrency);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 221, ObjectiveNames[gScenarioObjectiveType], 0);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 221, ObjectiveNames[gScenarioObjectiveType], COLOUR_BLACK);
y += 5;
// Objective outcome
if (gScenarioCompletedCompanyValue != MONEY32_UNDEFINED) {
if (gScenarioCompletedCompanyValue == 0x80000001) {
// Objective failed
gfx_draw_string_left_wrapped(dpi, NULL, x, y, 222, STR_OBJECTIVE_FAILED, 0);
gfx_draw_string_left_wrapped(dpi, NULL, x, y, 222, STR_OBJECTIVE_FAILED, COLOUR_BLACK);
} else {
// Objective completed
set_format_arg(0, money32, gScenarioCompletedCompanyValue);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 222, STR_OBJECTIVE_ACHIEVED, 0);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 222, STR_OBJECTIVE_ACHIEVED, COLOUR_BLACK);
}
}
}
@ -1918,14 +1918,14 @@ static void window_park_awards_paint(rct_window *w, rct_drawpixelinfo *dpi)
continue;
gfx_draw_sprite(dpi, ParkAwards[award->type].sprite, x, y, 0);
gfx_draw_string_left_wrapped(dpi, NULL, x + 34, y + 6, 180, ParkAwards[award->type].text, 0);
gfx_draw_string_left_wrapped(dpi, NULL, x + 34, y + 6, 180, ParkAwards[award->type].text, COLOUR_BLACK);
y += 32;
count++;
}
if (count == 0)
gfx_draw_string_left(dpi, STR_NO_RECENT_AWARDS, 0, 0, x + 6, y + 6);
gfx_draw_string_left(dpi, STR_NO_RECENT_AWARDS, NULL, COLOUR_BLACK, x + 6, y + 6);
}
#pragma endregion

4
src/windows/player.c
View File

@ -371,7 +371,7 @@ void window_player_overview_paint(rct_window *w, rct_drawpixelinfo *dpi)
dpi,
STR_STRING,
gCommonFormatArgs,
0,
COLOUR_BLACK,
w->x + (widget->left + widget->right - 11) / 2,
w->y + widget->top,
widget->right - widget->left - 8
@ -397,7 +397,7 @@ void window_player_overview_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (lastaction != -999) {
set_format_arg(0, rct_string_id, network_get_action_name_string_id(lastaction));
}
gfx_draw_string_centred_clipped(dpi, STR_LAST_ACTION_RAN, gCommonFormatArgs, 0, x, y, width);
gfx_draw_string_centred_clipped(dpi, STR_LAST_ACTION_RAN, gCommonFormatArgs, COLOUR_BLACK, x, y, width);
if (w->viewport != NULL && w->var_492 != -1) {
window_draw_viewport(dpi, w);

4
src/windows/publisher_credits.c
View File

@ -169,12 +169,12 @@ static void window_publisher_credits_scrollpaint(rct_window *w, rct_drawpixelinf
y += 86;
draw_string_centred_underline(dpi, STR_CREDITS_PUBLISHER_TILE, 0, 0, x, y);
draw_string_centred_underline(dpi, STR_CREDITS_PUBLISHER_TILE, NULL, COLOUR_BLACK, x, y);
y += 14;
for (int i = 0; i < sizeof(credits_order)/sizeof(int); i++) {
gfx_draw_string_centred(dpi, credits_order[i], x, y, 0, 0);
gfx_draw_string_centred(dpi, credits_order[i], x, y, COLOUR_BLACK, NULL);
y += 11;
}

14
src/windows/research.c
View File

@ -344,16 +344,16 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp
if (gResearchProgressStage == RESEARCH_STAGE_FINISHED_ALL) {
stringId = STR_RESEARCH_UNKNOWN;
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 296, STR_RESEARCH_TYPE_LABEL, 0);
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 296, STR_RESEARCH_TYPE_LABEL, COLOUR_BLACK);
y += 25;
// Progress
stringId = STR_RESEARCH_COMPLETED_AL;
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 296, STR_RESEARCH_PROGRESS_LABEL, 0);
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 296, STR_RESEARCH_PROGRESS_LABEL, COLOUR_BLACK);
y += 15;
set_format_arg(0, rct_string_id, STR_RESEARCH_STAGE_UNKNOWN);
gfx_draw_string_left(dpi, STR_RESEARCH_EXPECTED_LABEL, gCommonFormatArgs, 0, x, y);
gfx_draw_string_left(dpi, STR_RESEARCH_EXPECTED_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
} else {
// Research type
stringId = STR_RESEARCH_UNKNOWN;
@ -371,12 +371,12 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp
}
}
}
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 296, STR_RESEARCH_TYPE_LABEL, 0);
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 296, STR_RESEARCH_TYPE_LABEL, COLOUR_BLACK);
y += 25;
// Progress
stringId = ResearchStageNames[gResearchProgressStage];
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 296, STR_RESEARCH_PROGRESS_LABEL, 0);
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 296, STR_RESEARCH_PROGRESS_LABEL, COLOUR_BLACK);
y += 15;
// Expected
@ -390,7 +390,7 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp
set_format_arg(4, rct_string_id, DateGameMonthNames[gResearchExpectedMonth]);
}
}
gfx_draw_string_left(dpi, STR_RESEARCH_EXPECTED_LABEL, gCommonFormatArgs, 0, x, y);
gfx_draw_string_left(dpi, STR_RESEARCH_EXPECTED_LABEL, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
// Last development
@ -411,7 +411,7 @@ void window_research_development_page_paint(rct_window *w, rct_drawpixelinfo *dp
stringId = get_scenery_group_entry(typeId)->name;
lastDevelopmentFormat = STR_RESEARCH_SCENERY_LABEL;
}
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 266, lastDevelopmentFormat, 0);
gfx_draw_string_left_wrapped(dpi, &stringId, x, y, 266, lastDevelopmentFormat, COLOUR_BLACK);
}
}

102
src/windows/ride.c
View File

@ -2656,7 +2656,7 @@ static void window_ride_main_paint(rct_window *w, rct_drawpixelinfo *dpi)
STR_WINDOW_COLOUR_2_STRINGID,
w->x + (widget->left + widget->right - 11) / 2,
w->y + widget->top,
0,
COLOUR_BLACK,
gCommonFormatArgs
);
@ -2666,7 +2666,7 @@ static void window_ride_main_paint(rct_window *w, rct_drawpixelinfo *dpi)
dpi,
window_ride_get_status(w, gCommonFormatArgs),
gCommonFormatArgs,
0,
COLOUR_BLACK,
w->x + (widget->left + widget->right) / 2,
w->y + widget->top,
widget->right - widget->left
@ -2957,7 +2957,7 @@ static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi)
y = w->y + 64;
// Description
y += gfx_draw_string_left_wrapped(dpi, &rideEntry->description, x, y, 300, STR_BLACK_STRING, 0);
y += gfx_draw_string_left_wrapped(dpi, &rideEntry->description, x, y, 300, STR_BLACK_STRING, COLOUR_BLACK);
y += 5;
// Capacity
@ -2967,7 +2967,7 @@ static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi)
const utf8 * capacity = object_get_capacity(loadedObject);
set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, utf8 *, capacity);
gfx_draw_string_left(dpi, STR_CAPACITY, gCommonFormatArgs, 0, x, y);
gfx_draw_string_left(dpi, STR_CAPACITY, gCommonFormatArgs, COLOUR_BLACK, x, y);
}
y += 15;
@ -2975,21 +2975,21 @@ static void window_ride_vehicle_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Excitement Factor
factor = rideEntry->excitement_multipler;
if (factor > 0) {
gfx_draw_string_left(dpi, STR_EXCITEMENT_FACTOR, &factor, 0, x, y);
gfx_draw_string_left(dpi, STR_EXCITEMENT_FACTOR, &factor, COLOUR_BLACK, x, y);
y += 10;
}
// Intensity Factor
factor = rideEntry->intensity_multipler;
if (factor > 0) {
gfx_draw_string_left(dpi, STR_INTENSITY_FACTOR, &factor, 0, x, y);
gfx_draw_string_left(dpi, STR_INTENSITY_FACTOR, &factor, COLOUR_BLACK, x, y);
y += 10;
}
// Nausea Factor
factor = rideEntry->nausea_multipler;
if (factor > 0) {
gfx_draw_string_left(dpi, STR_NAUSEA_FACTOR, &factor, 0, x, y);
gfx_draw_string_left(dpi, STR_NAUSEA_FACTOR, &factor, COLOUR_BLACK, x, y);
y += 10;
}
}
@ -3656,7 +3656,7 @@ static void window_ride_operating_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Number of block sections
if (ride->mode == RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED || ride->mode == RIDE_MODE_POWERED_LAUNCH_BLOCK_SECTIONED) {
blockSections = ride->num_block_brakes + ride->num_stations;
gfx_draw_string_left(dpi, STR_BLOCK_SECTIONS, &blockSections, 0, w->x + 21,
gfx_draw_string_left(dpi, STR_BLOCK_SECTIONS, &blockSections, COLOUR_BLACK, w->x + 21,
ride->mode == RIDE_MODE_POWERED_LAUNCH_BLOCK_SECTIONED ? w->y + 89 : w->y + 61);
}
}
@ -4016,7 +4016,7 @@ static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi)
widget = &window_ride_maintenance_widgets[WIDX_INSPECTION_INTERVAL];
x = w->x + 4;
y = w->y + widget->top + 1;
gfx_draw_string_left(dpi, STR_INSPECTION, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_INSPECTION, NULL, COLOUR_BLACK, x, y);
// Reliability
widget = &window_ride_maintenance_widgets[WIDX_PAGE_BACKGROUND];
@ -4024,12 +4024,12 @@ static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi)
y = w->y + widget->top + 4;
reliability = ride->reliability >> 8;
gfx_draw_string_left(dpi, STR_RELIABILITY_LABEL_1757, &reliability, 0, x, y);
gfx_draw_string_left(dpi, STR_RELIABILITY_LABEL_1757, &reliability, COLOUR_BLACK, x, y);
window_ride_maintenance_draw_bar(w, dpi, x + 103, y, max(10, reliability), 14);
y += 11;
downTime = ride->downtime;
gfx_draw_string_left(dpi, STR_DOWN_TIME_LABEL_1889, &downTime, 0, x, y);
gfx_draw_string_left(dpi, STR_DOWN_TIME_LABEL_1889, &downTime, COLOUR_BLACK, x, y);
window_ride_maintenance_draw_bar(w, dpi, x + 103, y, downTime, 28);
y += 26;
@ -4044,7 +4044,7 @@ static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi)
else
stringId = STR_TIME_SINCE_LAST_INSPECTION_MORE_THAN_4_HOURS;
gfx_draw_string_left(dpi, stringId, &lastInspection, 0, x, y);
gfx_draw_string_left(dpi, stringId, &lastInspection, COLOUR_BLACK, x, y);
y += 12;
// Last / current breakdown
@ -4055,7 +4055,7 @@ static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi)
STR_CURRENT_BREAKDOWN :
STR_LAST_BREAKDOWN;
breakdownMessage = RideBreakdownReasonNames[ride->breakdown_reason];
gfx_draw_string_left(dpi, stringId, &breakdownMessage, 0, x, y);
gfx_draw_string_left(dpi, stringId, &breakdownMessage, COLOUR_BLACK, x, y);
y += 10;
// Mechanic status
@ -4078,13 +4078,13 @@ static void window_ride_maintenance_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (stringId != 0) {
if (stringId == STR_CALLING_MECHANIC) {
gfx_draw_string_left_wrapped(dpi, NULL, x + 4, y, 280, stringId, 0);
gfx_draw_string_left_wrapped(dpi, NULL, x + 4, y, 280, stringId, COLOUR_BLACK);
} else {
mechanicSprite = &(get_sprite(ride->mechanic)->peep);
if (peep_is_mechanic(mechanicSprite)) {
set_format_arg(0, rct_string_id, mechanicSprite->name_string_idx);
set_format_arg(2, uint32, mechanicSprite->id);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x + 4, y, 280, stringId, 0);
gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x + 4, y, 280, stringId, COLOUR_BLACK);
}
}
}
@ -5272,7 +5272,7 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
x = w->x + (widget->right - widget->left) / 2;
y = w->y + widget->top + 40;
gfx_draw_string_centred_wrapped(dpi, NULL, x, y, w->width - 8, STR_CLICK_ITEMS_OF_SCENERY_TO_SELECT, 0);
gfx_draw_string_centred_wrapped(dpi, NULL, x, y, w->width - 8, STR_CLICK_ITEMS_OF_SCENERY_TO_SELECT, COLOUR_BLACK);
x = w->x + 4;
y = w->y + window_ride_measurements_widgets[WIDX_SELECT_NEARBY_SCENERY].bottom + 17;
@ -5288,7 +5288,7 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
set_format_arg(0, uint32, ride->excitement);
set_format_arg(4, rct_string_id, RatingNames[min(ride->excitement >> 8, 5)]);
stringId = ride->excitement == -1 ? STR_EXCITEMENT_RATING_NOT_YET_AVAILABLE : STR_EXCITEMENT_RATING;
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, 0, x, y);
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += 10;
// Intensity
@ -5301,14 +5301,14 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
else if (ride->intensity >= RIDE_RATING(10,00))
stringId = STR_INTENSITY_RATING_RED;
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, 0, x, y);
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += 10;
// Nausea
set_format_arg(0, uint32, ride->nausea);
set_format_arg(4, rct_string_id, RatingNames[min(ride->nausea >> 8, 5)]);
stringId = ride->excitement == -1 ? STR_NAUSEA_RATING_NOT_YET_AVAILABLE : STR_NAUSEA_RATING;
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, 0, x, y);
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += 20;
// Horizontal rule
@ -5318,17 +5318,17 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
if (ride->type == RIDE_TYPE_MINI_GOLF) {
// Holes
holes = ride->holes & 0x1F;
gfx_draw_string_left(dpi, STR_HOLES, &holes, 0, x, y);
gfx_draw_string_left(dpi, STR_HOLES, &holes, COLOUR_BLACK, x, y);
y += 10;
} else {
// Max speed
maxSpeed = (ride->max_speed * 9) >> 18;
gfx_draw_string_left(dpi, STR_MAX_SPEED, &maxSpeed, 0, x, y);
gfx_draw_string_left(dpi, STR_MAX_SPEED, &maxSpeed, COLOUR_BLACK, x, y);
y += 10;
// Average speed
averageSpeed = (ride->average_speed * 9) >> 18;
gfx_draw_string_left(dpi, STR_AVERAGE_SPEED, &averageSpeed, 0, x, y);
gfx_draw_string_left(dpi, STR_AVERAGE_SPEED, &averageSpeed, COLOUR_BLACK, x, y);
y += 10;
// Ride time
@ -5354,7 +5354,7 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
set_format_arg(2 + (numTimes * 4), uint16, 0);
set_format_arg(4 + (numTimes * 4), uint16, 0);
set_format_arg(6 + (numTimes * 4), uint16, 0);
gfx_draw_string_left_clipped(dpi, STR_RIDE_TIME, gCommonFormatArgs, 0, x, y, 308);
gfx_draw_string_left_clipped(dpi, STR_RIDE_TIME, gCommonFormatArgs, COLOUR_BLACK, x, y, 308);
y += 10;
}
@ -5382,7 +5382,7 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
set_format_arg(2 + (numLengths * 4), uint16, 0);
set_format_arg(4 + (numLengths * 4), uint16, 0);
set_format_arg(6 + (numLengths * 4), uint16, 0);
gfx_draw_string_left_clipped(dpi, STR_RIDE_LENGTH, gCommonFormatArgs, 0, x, y, 308);
gfx_draw_string_left_clipped(dpi, STR_RIDE_LENGTH, gCommonFormatArgs, COLOUR_BLACK, x, y, 308);
y += 10;
if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_G_FORCES)) {
@ -5390,38 +5390,38 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
maxPositiveVerticalGs = ride->max_positive_vertical_g;
stringId = maxPositiveVerticalGs >= FIXED_2DP(5,00) ?
STR_MAX_POSITIVE_VERTICAL_G_RED : STR_MAX_POSITIVE_VERTICAL_G;
gfx_draw_string_left(dpi, stringId, &maxPositiveVerticalGs, 0, x, y);
gfx_draw_string_left(dpi, stringId, &maxPositiveVerticalGs, COLOUR_BLACK, x, y);
y += 10;
// Max. negative vertical G's
maxNegativeVerticalGs = ride->max_negative_vertical_g;
stringId = maxNegativeVerticalGs <= -FIXED_2DP(2,00) ?
STR_MAX_NEGATIVE_VERTICAL_G_RED : STR_MAX_NEGATIVE_VERTICAL_G;
gfx_draw_string_left(dpi, stringId, &maxNegativeVerticalGs, 0, x, y);
gfx_draw_string_left(dpi, stringId, &maxNegativeVerticalGs, COLOUR_BLACK, x, y);
y += 10;
// Max lateral G's
maxLateralGs = ride->max_lateral_g;
stringId = maxLateralGs >= FIXED_2DP(2,80) ?
STR_MAX_LATERAL_G_RED : STR_MAX_LATERAL_G;
gfx_draw_string_left(dpi, stringId, &maxLateralGs, 0, x, y);
gfx_draw_string_left(dpi, stringId, &maxLateralGs, COLOUR_BLACK, x, y);
y += 10;
// Total 'air' time
totalAirTime = ride->total_air_time * 3;
gfx_draw_string_left(dpi, STR_TOTAL_AIR_TIME, &totalAirTime, 0, x, y);
gfx_draw_string_left(dpi, STR_TOTAL_AIR_TIME, &totalAirTime, COLOUR_BLACK, x, y);
y += 10;
}
if (ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_HAS_DROPS)) {
// Drops
drops = ride->drops & 0x3F;
gfx_draw_string_left(dpi, STR_DROPS, &drops, 0, x, y);
gfx_draw_string_left(dpi, STR_DROPS, &drops, COLOUR_BLACK, x, y);
y += 10;
// Highest drop height
highestDropHeight = (ride->highest_drop_height * 3) / 4;
gfx_draw_string_left(dpi, STR_HIGHEST_DROP_HEIGHT, &highestDropHeight, 0, x, y);
gfx_draw_string_left(dpi, STR_HIGHEST_DROP_HEIGHT, &highestDropHeight, COLOUR_BLACK, x, y);
y += 10;
}
@ -5429,13 +5429,13 @@ static void window_ride_measurements_paint(rct_window *w, rct_drawpixelinfo *dpi
// Inversions
inversions = ride->inversions & 0x1F;
if (inversions != 0) {
gfx_draw_string_left(dpi, STR_INVERSIONS, &inversions, 0, x, y);
gfx_draw_string_left(dpi, STR_INVERSIONS, &inversions, COLOUR_BLACK, x, y);
y += 10;
}
}
}
} else {
gfx_draw_string_left(dpi, STR_NO_TEST_RESULTS_YET, NULL, 0, x, y);
gfx_draw_string_left(dpi, STR_NO_TEST_RESULTS_YET, NULL, COLOUR_BLACK, x, y);
}
}
}
@ -5697,7 +5697,7 @@ static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi
x = (widget->right - widget->left) / 2;
y = (widget->bottom - widget->top) / 2 - 5;
width = widget->right - widget->left - 2;
gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, width, stringId, 0);
gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, width, stringId, COLOUR_BLACK);
return;
}
@ -5739,7 +5739,7 @@ static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi
if (listType == GRAPH_ALTITUDE)
scaled_yUnit /= 2;
gfx_draw_string_left(dpi, stringID, &scaled_yUnit, 0, w->scrolls[0].h_left + 1, y - 4);
gfx_draw_string_left(dpi, stringID, &scaled_yUnit, COLOUR_BLACK, w->scrolls[0].h_left + 1, y - 4);
}
// Time marks
@ -5747,7 +5747,7 @@ static void window_ride_graphs_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi
time = 0;
for (x = 0; x < dpi->x + dpi->width; x += 80) {
if (x + 80 >= dpi->x)
gfx_draw_string_left(dpi, STR_RIDE_STATS_TIME, &time, 0, x + 2, 1);
gfx_draw_string_left(dpi, STR_RIDE_STATS_TIME, &time, COLOUR_BLACK, x + 2, 1);
time += 5;
}
@ -6170,7 +6170,7 @@ static void window_ride_income_paint(rct_window *w, rct_drawpixelinfo *dpi)
stringId = STR_LOSS_PER_ITEM_SOLD;
}
gfx_draw_string_left(dpi, stringId, &profit, 0, x, y);
gfx_draw_string_left(dpi, stringId, &profit, COLOUR_BLACK, x, y);
}
y += 39;
@ -6189,31 +6189,31 @@ static void window_ride_income_paint(rct_window *w, rct_drawpixelinfo *dpi)
stringId = STR_LOSS_PER_ITEM_SOLD;
}
gfx_draw_string_left(dpi, stringId, &profit, 0, x, y);
gfx_draw_string_left(dpi, stringId, &profit, COLOUR_BLACK, x, y);
}
y += 15;
// Income per hour
if (ride->income_per_hour != MONEY32_UNDEFINED) {
gfx_draw_string_left(dpi, STR_INCOME_PER_HOUR, &ride->income_per_hour, 0, x, y);
gfx_draw_string_left(dpi, STR_INCOME_PER_HOUR, &ride->income_per_hour, COLOUR_BLACK, x, y);
y += 10;
}
// Running cost per hour
costPerHour = ride->upkeep_cost * 16;
stringId = ride->upkeep_cost == (money16)0xFFFF ? STR_RUNNING_COST_UNKNOWN : STR_RUNNING_COST_PER_HOUR;
gfx_draw_string_left(dpi, stringId, &costPerHour, 0, x, y);
gfx_draw_string_left(dpi, stringId, &costPerHour, COLOUR_BLACK, x, y);
y += 10;
// Profit per hour
if (ride->profit != MONEY32_UNDEFINED) {
gfx_draw_string_left(dpi, STR_PROFIT_PER_HOUR, &ride->profit, 0, x, y);
gfx_draw_string_left(dpi, STR_PROFIT_PER_HOUR, &ride->profit, COLOUR_BLACK, x, y);
y += 10;
}
y += 5;
// Total profit
gfx_draw_string_left(dpi, STR_TOTAL_PROFIT, &ride->total_profit, 0, x, y);
gfx_draw_string_left(dpi, STR_TOTAL_PROFIT, &ride->total_profit, COLOUR_BLACK, x, y);
}
#pragma endregion
@ -6344,13 +6344,13 @@ static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Customers currently on ride
if (gRideClassifications[ride->type] == RIDE_CLASS_RIDE) {
sint16 customersOnRide = ride->num_riders;
gfx_draw_string_left(dpi, STR_CUSTOMERS_ON_RIDE, &customersOnRide, 0, x, y);
gfx_draw_string_left(dpi, STR_CUSTOMERS_ON_RIDE, &customersOnRide, COLOUR_BLACK, x, y);
y += 10;
}
// Customers per hour
customersPerHour = ride_customers_per_hour(ride);
gfx_draw_string_left(dpi, STR_CUSTOMERS_PER_HOUR, &customersPerHour, 0, x, y);
gfx_draw_string_left(dpi, STR_CUSTOMERS_PER_HOUR, &customersPerHour, COLOUR_BLACK, x, y);
y += 10;
// Popularity
@ -6361,7 +6361,7 @@ static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi)
stringId = STR_POPULARITY_PERCENT;
popularity *= 4;
}
gfx_draw_string_left(dpi, stringId, &popularity, 0, x, y);
gfx_draw_string_left(dpi, stringId, &popularity, COLOUR_BLACK, x, y);
y += 10;
// Satisfaction
@ -6372,14 +6372,14 @@ static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi)
stringId = STR_SATISFACTION_PERCENT;
satisfaction *= 5;
}
gfx_draw_string_left(dpi, stringId, &satisfaction, 0, x, y);
gfx_draw_string_left(dpi, stringId, &satisfaction, COLOUR_BLACK, x, y);
y += 10;
// Queue time
if (gRideClassifications[ride->type] == RIDE_CLASS_RIDE) {
queueTime = ride_get_max_queue_time(ride);
stringId = queueTime == 1 ? STR_QUEUE_TIME_MINUTE : STR_QUEUE_TIME_MINUTES;
y += gfx_draw_string_left_wrapped(dpi, &queueTime, x, y, 308, stringId, 0);
y += gfx_draw_string_left_wrapped(dpi, &queueTime, x, y, 308, stringId, COLOUR_BLACK);
y += 5;
}
@ -6388,7 +6388,7 @@ static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (shopItem != SHOP_ITEM_NONE) {
set_format_arg(0, rct_string_id, ShopItemStringIds[shopItem].plural);
set_format_arg(2, uint32, ride->no_primary_items_sold);
gfx_draw_string_left(dpi, STR_ITEMS_SOLD, gCommonFormatArgs, 0, x, y);
gfx_draw_string_left(dpi, STR_ITEMS_SOLD, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += 10;
}
@ -6399,12 +6399,12 @@ static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (shopItem != SHOP_ITEM_NONE) {
set_format_arg(0, rct_string_id, ShopItemStringIds[shopItem].plural);
set_format_arg(2, uint32, ride->no_secondary_items_sold);
gfx_draw_string_left(dpi, STR_ITEMS_SOLD, gCommonFormatArgs, 0, x, y);
gfx_draw_string_left(dpi, STR_ITEMS_SOLD, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += 10;
}
// Total customers
gfx_draw_string_left(dpi, STR_TOTAL_CUSTOMERS, &ride->total_customers, 0, x, y);
gfx_draw_string_left(dpi, STR_TOTAL_CUSTOMERS, &ride->total_customers, COLOUR_BLACK, x, y);
y += 10;
// Guests favourite
@ -6412,7 +6412,7 @@ static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi)
stringId = ride->guests_favourite == 1 ?
STR_FAVOURITE_RIDE_OF_GUEST :
STR_FAVOURITE_RIDE_OF_GUESTS;
gfx_draw_string_left(dpi, stringId, &ride->guests_favourite, 0, x, y);
gfx_draw_string_left(dpi, stringId, &ride->guests_favourite, COLOUR_BLACK, x, y);
y += 10;
}
y += 2;
@ -6425,7 +6425,7 @@ static void window_ride_customer_paint(rct_window *w, rct_drawpixelinfo *dpi)
age == 1 ?
STR_BUILT_LAST_YEAR :
STR_BUILT_YEARS_AGO;
gfx_draw_string_left(dpi, stringId, &age, 0, x, y);
gfx_draw_string_left(dpi, stringId, &age, COLOUR_BLACK, x, y);
}
#pragma endregion

4
src/windows/ride_construction.c
View File

@ -2195,14 +2195,14 @@ static void window_ride_construction_paint(rct_window *w, rct_drawpixelinfo *dpi
x = w->x + (widget->left + widget->right) / 2;
y = w->y + widget->bottom - 23;
if (_rideConstructionState != RIDE_CONSTRUCTION_STATE_PLACE)
gfx_draw_string_centred(dpi, STR_BUILD_THIS, x, y, 0, w);
gfx_draw_string_centred(dpi, STR_BUILD_THIS, x, y, COLOUR_BLACK, w);
y += 11;
if (
_currentTrackPrice != MONEY32_UNDEFINED &&
!(gParkFlags & PARK_FLAGS_NO_MONEY)
) {
gfx_draw_string_centred(dpi, STR_COST_LABEL, x, y, 0, (void*)&_currentTrackPrice);
gfx_draw_string_centred(dpi, STR_COST_LABEL, x, y, COLOUR_BLACK, (void*)&_currentTrackPrice);
}
}

6
src/windows/ride_list.c
View File

@ -514,7 +514,7 @@ static void window_ride_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
window_ride_list_draw_tab_images(dpi, w);
// Draw number of attractions on bottom
gfx_draw_string_left(dpi, ride_list_statusbar_count_strings[w->page], &w->no_list_items, 0, w->x + 4, w->widgets[WIDX_LIST].bottom + w->y + 2);
gfx_draw_string_left(dpi, ride_list_statusbar_count_strings[w->page], &w->no_list_items, COLOUR_BLACK, w->x + 4, w->widgets[WIDX_LIST].bottom + w->y + 2);
}
/**
@ -543,7 +543,7 @@ static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
ride = get_ride(w->list_item_positions[i]);
// Ride name
gfx_draw_string_left_clipped(dpi, format, &ride->name, 0, 0, y - 1, 159);
gfx_draw_string_left_clipped(dpi, format, &ride->name, COLOUR_BLACK, 0, y - 1, 159);
// Ride information
formatSecondary = 0;
@ -657,7 +657,7 @@ static void window_ride_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
format = STR_RED_OUTLINED_STRING;
set_format_arg(0, rct_string_id, formatSecondary);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, 0, 160, y - 1, 157);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, COLOUR_BLACK, 160, y - 1, 157);
y += 10;
}
}

4
src/windows/scenery.c
View File

@ -1073,12 +1073,12 @@ void window_scenery_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (!(gParkFlags & PARK_FLAGS_NO_MONEY)) {
// -14
gfx_draw_string_right(dpi, STR_COST_LABEL, gCommonFormatArgs, 0,
gfx_draw_string_right(dpi, STR_COST_LABEL, gCommonFormatArgs, COLOUR_BLACK,
w->x + w->width - 0x1A, w->y + w->height - 13);
}
set_format_arg(0, rct_string_id, sceneryEntry->name);
gfx_draw_string_left_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, 0,
gfx_draw_string_left_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK,
w->x + 3, w->y + w->height - 13, w->width - 19);
}

2
src/windows/shortcut_key_change.c
View File

@ -118,5 +118,5 @@ static void window_shortcut_change_paint(rct_window *w, rct_drawpixelinfo *dpi)
int y = w->y + 30;
set_format_arg(0, rct_string_id, ShortcutStringIds[gKeyboardShortcutChangeId]);
gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, 242, STR_SHORTCUT_CHANGE_PROMPT, 0);
gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, 242, STR_SHORTCUT_CHANGE_PROMPT, COLOUR_BLACK);
}

2
src/windows/shortcut_keys.c
View File

@ -263,6 +263,6 @@ static void window_shortcut_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, i
set_format_arg(2, rct_string_id, ShortcutStringIds[i]);
set_format_arg(4, rct_string_id, STR_STRING);
set_format_arg(6, char *, templateString);
gfx_draw_string_left(dpi, format, gCommonFormatArgs, 0, 0, y - 1);
gfx_draw_string_left(dpi, format, gCommonFormatArgs, COLOUR_BLACK, 0, y - 1);
}
}

18
src/windows/staff.c
View File

@ -937,7 +937,7 @@ void window_staff_overview_paint(rct_window *w, rct_drawpixelinfo *dpi)
int x = (widget->left + widget->right) / 2 + w->x;
int y = w->y + widget->top;
int width = widget->right - widget->left;
gfx_draw_string_centred_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, 0, x, y, width);
gfx_draw_string_centred_clipped(dpi, STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, x, y, width);
}
/**
@ -1075,27 +1075,27 @@ void window_staff_stats_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (!(gParkFlags & PARK_FLAGS_NO_MONEY)) {
set_format_arg(0, money32, wage_table[peep->staff_type]);
gfx_draw_string_left(dpi, STR_STAFF_STAT_WAGES, gCommonFormatArgs, 0, x, y);
gfx_draw_string_left(dpi, STR_STAFF_STAT_WAGES, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += 10;
}
gfx_draw_string_left(dpi, STR_STAFF_STAT_EMPLOYED_FOR, (void*)&peep->time_in_park, 0, x, y);
gfx_draw_string_left(dpi, STR_STAFF_STAT_EMPLOYED_FOR, (void*)&peep->time_in_park, COLOUR_BLACK, x, y);
y += 10;
switch (peep->staff_type){
case STAFF_TYPE_HANDYMAN:
gfx_draw_string_left(dpi, STR_STAFF_STAT_LAWNS_MOWN, (void*)&peep->staff_lawns_mown, 0, x, y);
gfx_draw_string_left(dpi, STR_STAFF_STAT_LAWNS_MOWN, (void*)&peep->staff_lawns_mown, COLOUR_BLACK, x, y);
y += 10;
gfx_draw_string_left(dpi, STR_STAFF_STAT_GARDENS_WATERED, (void*)&peep->staff_gardens_watered, 0, x, y);
gfx_draw_string_left(dpi, STR_STAFF_STAT_GARDENS_WATERED, (void*)&peep->staff_gardens_watered, COLOUR_BLACK, x, y);
y += 10;
gfx_draw_string_left(dpi, STR_STAFF_STAT_LITTER_SWEPT, (void*)&peep->staff_litter_swept, 0, x, y);
gfx_draw_string_left(dpi, STR_STAFF_STAT_LITTER_SWEPT, (void*)&peep->staff_litter_swept, COLOUR_BLACK, x, y);
y += 10;
gfx_draw_string_left(dpi, STR_STAFF_STAT_BINS_EMPTIED, (void*)&peep->staff_bins_emptied, 0, x, y);
gfx_draw_string_left(dpi, STR_STAFF_STAT_BINS_EMPTIED, (void*)&peep->staff_bins_emptied, COLOUR_BLACK, x, y);
break;
case STAFF_TYPE_MECHANIC:
gfx_draw_string_left(dpi, STR_STAFF_STAT_RIDES_INSPECTED, (void*)&peep->staff_rides_inspected, 0, x, y);
gfx_draw_string_left(dpi, STR_STAFF_STAT_RIDES_INSPECTED, (void*)&peep->staff_rides_inspected, COLOUR_BLACK, x, y);
y += 10;
gfx_draw_string_left(dpi, STR_STAFF_STAT_RIDES_FIXED, (void*)&peep->staff_rides_fixed, 0, x, y);
gfx_draw_string_left(dpi, STR_STAFF_STAT_RIDES_FIXED, (void*)&peep->staff_rides_fixed, COLOUR_BLACK, x, y);
break;
}
}

2
src/windows/staff_fire_prompt.c
View File

@ -139,5 +139,5 @@ static void window_staff_fire_paint(rct_window *w, rct_drawpixelinfo *dpi)
int x = w->x + WW / 2;
int y = w->y + (WH / 2) - 3;
gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, WW - 4, STR_FIRE_STAFF_ID, 0);
gfx_draw_string_centred_wrapped(dpi, gCommonFormatArgs, x, y, WW - 4, STR_FIRE_STAFF_ID, COLOUR_BLACK);
}

10
src/windows/staff_list.c
View File

@ -586,11 +586,11 @@ void window_staff_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (!(gParkFlags & PARK_FLAGS_NO_MONEY)) {
set_format_arg(0, money32, wage_table[selectedTab]);
gfx_draw_string_left(dpi, STR_COST_PER_MONTH, gCommonFormatArgs, 0, w->x + w->width - 155, w->y + 0x20);
gfx_draw_string_left(dpi, STR_COST_PER_MONTH, gCommonFormatArgs, COLOUR_BLACK, w->x + w->width - 155, w->y + 0x20);
}
if (selectedTab < 3) {
gfx_draw_string_left(dpi, STR_UNIFORM_COLOUR, w, 0, w->x + 6, window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].top + w->y + 1);
gfx_draw_string_left(dpi, STR_UNIFORM_COLOUR, w, COLOUR_BLACK, w->x + 6, window_staff_list_widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].top + w->y + 1);
}
int staffTypeStringId = StaffNamingConvention[selectedTab].plural;
@ -602,7 +602,7 @@ void window_staff_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
set_format_arg(0, uint16, _window_staff_list_selected_type_count);
set_format_arg(2, rct_string_id, staffTypeStringId);
gfx_draw_string_left(dpi, STR_STAFF_LIST_COUNTER, gCommonFormatArgs, 0, w->x + 4, window_staff_list_widgets[WIDX_STAFF_LIST_LIST].bottom + w->y + 2);
gfx_draw_string_left(dpi, STR_STAFF_LIST_COUNTER, gCommonFormatArgs, COLOUR_BLACK, w->x + 4, window_staff_list_widgets[WIDX_STAFF_LIST_LIST].bottom + w->y + 2);
}
/** rct2: 0x00992A08 */
@ -659,12 +659,12 @@ void window_staff_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi, int sc
set_format_arg(0, rct_string_id, peep->name_string_idx);
set_format_arg(2, uint32, peep->id);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, 0, 0, y - 1, 107);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, COLOUR_BLACK, 0, y - 1, 107);
get_arguments_from_action(peep, &argument_1, &argument_2);
set_format_arg(0, uint32, argument_1);
set_format_arg(4, uint32, argument_2);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, 0, 175, y - 1, 305);
gfx_draw_string_left_clipped(dpi, format, gCommonFormatArgs, COLOUR_BLACK, 175, y - 1, 305);
// True if a patrol path is set for the worker
if (gStaffModes[peep->staff_id] & 2) {

14
src/windows/title_scenarioselect.c
View File

@ -396,9 +396,9 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Show locked information
x = w->x + window_scenarioselect_widgets[WIDX_SCENARIOLIST].right + 4;
y = w->y + window_scenarioselect_widgets[WIDX_TABCONTENT].top + 5;
gfx_draw_string_centred_clipped(dpi, STR_SCENARIO_LOCKED, NULL, 0, x + 85, y, 170);
gfx_draw_string_centred_clipped(dpi, STR_SCENARIO_LOCKED, NULL, COLOUR_BLACK, x + 85, y, 170);
y += 15;
y += gfx_draw_string_left_wrapped(dpi, NULL, x, y, 170, STR_SCENARIO_LOCKED_DESC, 0) + 5;
y += gfx_draw_string_left_wrapped(dpi, NULL, x, y, 170, STR_SCENARIO_LOCKED_DESC, COLOUR_BLACK) + 5;
}
return;
}
@ -419,20 +419,20 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi)
y = w->y + window_scenarioselect_widgets[WIDX_TABCONTENT].top + 5;
set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, const char *, scenario->name);
gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, 0, x + 85, y, 170);
gfx_draw_string_centred_clipped(dpi, STR_WINDOW_COLOUR_2_STRINGID, gCommonFormatArgs, COLOUR_BLACK, x + 85, y, 170);
y += 15;
// Scenario details
set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, const char *, scenario->details);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 170, STR_BLACK_STRING, 0) + 5;
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 170, STR_BLACK_STRING, COLOUR_BLACK) + 5;
// Scenario objective
set_format_arg(0, rct_string_id, ObjectiveNames[scenario->objective_type]);
set_format_arg(2, short, scenario->objective_arg_3);
set_format_arg(4, short, date_get_total_months(MONTH_OCTOBER, scenario->objective_arg_1));
set_format_arg(6, int, scenario->objective_arg_2);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 170, STR_OBJECTIVE, 0) + 5;
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 170, STR_OBJECTIVE, COLOUR_BLACK) + 5;
// Scenario score
if (scenario->highscore != NULL) {
@ -444,7 +444,7 @@ static void window_scenarioselect_paint(rct_window *w, rct_drawpixelinfo *dpi)
set_format_arg(0, rct_string_id, STR_STRING);
set_format_arg(2, const char *, completedByName);
set_format_arg(2 + sizeof(const char *), money32, scenario->highscore->company_value);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 170, STR_COMPLETED_BY_WITH_COMPANY_VALUE, 0);
y += gfx_draw_string_left_wrapped(dpi, gCommonFormatArgs, x, y, 170, STR_COMPLETED_BY_WITH_COMPANY_VALUE, COLOUR_BLACK);
}
}
@ -511,7 +511,7 @@ static void window_scenarioselect_scrollpaint(rct_window *w, rct_drawpixelinfo *
set_format_arg(0, rct_string_id, STR_COMPLETED_BY);
set_format_arg(2, rct_string_id, STR_STRING);
set_format_arg(4, char *, buffer);
gfx_draw_string_centred(dpi, format, wide ? 270 : 210, y + 11, 0, gCommonFormatArgs);
gfx_draw_string_centred(dpi, format, wide ? 270 : 210, y + 11, COLOUR_BLACK, gCommonFormatArgs);
}
y += 24;

44
src/windows/track_list.c
View File

@ -430,21 +430,21 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Warnings
if ((td6->track_flags & TRACK_DESIGN_FLAG_VEHICLE_UNAVAILABLE) && !(gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER)) {
// Vehicle design not available
gfx_draw_string_centred_clipped(dpi, STR_VEHICLE_DESIGN_UNAVAILABLE, NULL, 0, x, y, 368);
gfx_draw_string_centred_clipped(dpi, STR_VEHICLE_DESIGN_UNAVAILABLE, NULL, COLOUR_BLACK, x, y, 368);
y -= 10;
}
if (td6->track_flags & TRACK_DESIGN_FLAG_SCENERY_UNAVAILABLE) {
if (!gTrackDesignSceneryToggle) {
// Scenery not available
gfx_draw_string_centred_clipped(dpi, STR_DESIGN_INCLUDES_SCENERY_WHICH_IS_UNAVAILABLE, NULL, 0, x, y, 368);
gfx_draw_string_centred_clipped(dpi, STR_DESIGN_INCLUDES_SCENERY_WHICH_IS_UNAVAILABLE, NULL, COLOUR_BLACK, x, y, 368);
y -= 10;
}
}
// Track design name
utf8 *trackName = _trackDesigns[trackIndex].name;
gfx_draw_string_centred_clipped(dpi, STR_TRACK_PREVIEW_NAME_FORMAT, &trackName, 0, x, y, 368);
gfx_draw_string_centred_clipped(dpi, STR_TRACK_PREVIEW_NAME_FORMAT, &trackName, COLOUR_BLACK, x, y, 368);
// Information
x = w->x + widget->left + 1;
@ -452,56 +452,56 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Stats
fixed32_2dp rating = td6->excitement * 10;
gfx_draw_string_left(dpi, STR_TRACK_LIST_EXCITEMENT_RATING, &rating, 0, x, y);
gfx_draw_string_left(dpi, STR_TRACK_LIST_EXCITEMENT_RATING, &rating, COLOUR_BLACK, x, y);
y += 10;
rating = td6->intensity * 10;
gfx_draw_string_left(dpi, STR_TRACK_LIST_INTENSITY_RATING, &rating, 0, x, y);
gfx_draw_string_left(dpi, STR_TRACK_LIST_INTENSITY_RATING, &rating, COLOUR_BLACK, x, y);
y += 10;
rating = td6->nausea * 10;
gfx_draw_string_left(dpi, STR_TRACK_LIST_NAUSEA_RATING, &rating, 0, x, y);
gfx_draw_string_left(dpi, STR_TRACK_LIST_NAUSEA_RATING, &rating, COLOUR_BLACK, x, y);
y += 14;
if (td6->type != RIDE_TYPE_MAZE) {
if (td6->type == RIDE_TYPE_MINI_GOLF) {
// Holes
uint16 holes = td6->holes & 0x1F;
gfx_draw_string_left(dpi, STR_HOLES, &holes, 0, x, y);
gfx_draw_string_left(dpi, STR_HOLES, &holes, COLOUR_BLACK, x, y);
y += 10;
} else {
// Maximum speed
uint16 speed = ((td6->max_speed << 16) * 9) >> 18;
gfx_draw_string_left(dpi, STR_MAX_SPEED, &speed, 0, x, y);
gfx_draw_string_left(dpi, STR_MAX_SPEED, &speed, COLOUR_BLACK, x, y);
y += 10;
// Average speed
speed = ((td6->average_speed << 16) * 9) >> 18;
gfx_draw_string_left(dpi, STR_AVERAGE_SPEED, &speed, 0, x, y);
gfx_draw_string_left(dpi, STR_AVERAGE_SPEED, &speed, COLOUR_BLACK, x, y);
y += 10;
}
// Ride length
set_format_arg(0, rct_string_id, STR_RIDE_LENGTH_ENTRY);
set_format_arg(2, uint16, td6->ride_length);
gfx_draw_string_left_clipped(dpi, STR_TRACK_LIST_RIDE_LENGTH, gCommonFormatArgs, 0, x, y, 214);
gfx_draw_string_left_clipped(dpi, STR_TRACK_LIST_RIDE_LENGTH, gCommonFormatArgs, COLOUR_BLACK, x, y, 214);
y += 10;
}
if (ride_type_has_flag(td6->type, RIDE_TYPE_FLAG_HAS_G_FORCES)) {
// Maximum positive vertical Gs
int gForces = td6->max_positive_vertical_g * 32;
gfx_draw_string_left(dpi, STR_MAX_POSITIVE_VERTICAL_G, &gForces, 0, x, y);
gfx_draw_string_left(dpi, STR_MAX_POSITIVE_VERTICAL_G, &gForces, COLOUR_BLACK, x, y);
y += 10;
// Maximum negative verical Gs
gForces = td6->max_negative_vertical_g * 32;
gfx_draw_string_left(dpi, STR_MAX_NEGATIVE_VERTICAL_G, &gForces, 0, x, y);
gfx_draw_string_left(dpi, STR_MAX_NEGATIVE_VERTICAL_G, &gForces, COLOUR_BLACK, x, y);
y += 10;
// Maximum lateral Gs
gForces = td6->max_lateral_g * 32;
gfx_draw_string_left(dpi, STR_MAX_LATERAL_G, &gForces, 0, x, y);
gfx_draw_string_left(dpi, STR_MAX_LATERAL_G, &gForces, COLOUR_BLACK, x, y);
y += 10;
// If .TD6
@ -509,7 +509,7 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (td6->total_air_time != 0) {
// Total air time
int airTime = td6->total_air_time * 25;
gfx_draw_string_left(dpi, STR_TOTAL_AIR_TIME, &airTime, 0, x, y);
gfx_draw_string_left(dpi, STR_TOTAL_AIR_TIME, &airTime, COLOUR_BLACK, x, y);
y += 10;
}
}
@ -518,11 +518,11 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
if (ride_type_has_flag(td6->type, RIDE_TYPE_FLAG_HAS_DROPS)) {
// Drops
uint16 drops = td6->drops & 0x3F;
gfx_draw_string_left(dpi, STR_DROPS, &drops, 0, x, y);
gfx_draw_string_left(dpi, STR_DROPS, &drops, COLOUR_BLACK, x, y);
y += 10;
// Drop height is multiplied by 0.75
gfx_draw_string_left(dpi, STR_HIGHEST_DROP_HEIGHT, &drops, 0, x, y);
gfx_draw_string_left(dpi, STR_HIGHEST_DROP_HEIGHT, &drops, COLOUR_BLACK, x, y);
y += 10;
}
@ -530,7 +530,7 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
uint16 inversions = td6->inversions & 0x1F;
if (inversions != 0) {
// Inversions
gfx_draw_string_left(dpi, STR_INVERSIONS, &inversions, 0, x, y);
gfx_draw_string_left(dpi, STR_INVERSIONS, &inversions, COLOUR_BLACK, x, y);
y += 10;
}
}
@ -540,12 +540,12 @@ static void window_track_list_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Space required
set_format_arg(0, uint16, td6->space_required_x);
set_format_arg(2, uint16, td6->space_required_y);
gfx_draw_string_left(dpi, STR_TRACK_LIST_SPACE_REQUIRED, gCommonFormatArgs, 0, x, y);
gfx_draw_string_left(dpi, STR_TRACK_LIST_SPACE_REQUIRED, gCommonFormatArgs, COLOUR_BLACK, x, y);
y += 10;
}
if (td6->cost != 0) {
gfx_draw_string_left(dpi, STR_TRACK_LIST_COST_AROUND, &td6->cost, 0, x, y);
gfx_draw_string_left(dpi, STR_TRACK_LIST_COST_AROUND, &td6->cost, COLOUR_BLACK, x, y);
y += 14;
}
}
@ -566,7 +566,7 @@ static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
if (gScreenFlags & SCREEN_FLAGS_TRACK_MANAGER) {
if (_trackDesignsCount == 0) {
// No track designs
gfx_draw_string_left(dpi, STR_NO_TRACK_DESIGNS_OF_THIS_TYPE, NULL, 0, x, y - 1);
gfx_draw_string_left(dpi, STR_NO_TRACK_DESIGNS_OF_THIS_TYPE, NULL, COLOUR_BLACK, x, y - 1);
return;
}
} else {
@ -581,7 +581,7 @@ static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
}
rct_string_id stringId2 = STR_BUILD_CUSTOM_DESIGN;
gfx_draw_string_left(dpi, stringId, &stringId2, 0, x, y - 1);
gfx_draw_string_left(dpi, stringId, &stringId2, COLOUR_BLACK, x, y - 1);
y += 10;
listIndex++;
}
@ -600,7 +600,7 @@ static void window_track_list_scrollpaint(rct_window *w, rct_drawpixelinfo *dpi,
// Draw track name
set_format_arg(0, rct_string_id, STR_TRACK_LIST_NAME_FORMAT);
set_format_arg(2, utf8*, _trackDesigns[i].name);
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, 0, x, y - 1);
gfx_draw_string_left(dpi, stringId, gCommonFormatArgs, COLOUR_BLACK, x, y - 1);
}
y += 10;
}

2
src/windows/track_manage.c
View File

@ -324,7 +324,7 @@ static void window_track_delete_prompt_paint(rct_window *w, rct_drawpixelinfo *d
w->y + 28,
246,
STR_ARE_YOU_SURE_YOU_WANT_TO_PERMANENTLY_DELETE_TRACK,
0
COLOUR_BLACK
);
}

2
src/windows/track_place.c
View File

@ -467,7 +467,7 @@ static void window_track_place_paint(rct_window *w, rct_drawpixelinfo *dpi)
// Price
if (_window_track_place_last_cost != MONEY32_UNDEFINED && !(gParkFlags & PARK_FLAGS_NO_MONEY)) {
gfx_draw_string_centred(dpi, STR_COST_LABEL, w->x + 88, w->y + 94, 0, &_window_track_place_last_cost);
gfx_draw_string_centred(dpi, STR_COST_LABEL, w->x + 88, w->y + 94, COLOUR_BLACK, &_window_track_place_last_cost);
}
}

6
src/windows/water.c
View File

@ -226,7 +226,7 @@ static void window_water_paint(rct_window *w, rct_drawpixelinfo *dpi)
window_draw_widgets(w, dpi);
// Draw number for tool sizes bigger than 7
if (gLandToolSize > 7) {
gfx_draw_string_centred(dpi, STR_LAND_TOOL_SIZE_VALUE, x, y - 2, 0, &gLandToolSize);
gfx_draw_string_centred(dpi, STR_LAND_TOOL_SIZE_VALUE, x, y - 2, COLOUR_BLACK, &gLandToolSize);
}
y = w->y + window_water_widgets[WIDX_PREVIEW].bottom + 5;
@ -235,12 +235,12 @@ static void window_water_paint(rct_window *w, rct_drawpixelinfo *dpi)
x = (window_water_widgets[WIDX_PREVIEW].left + window_water_widgets[WIDX_PREVIEW].right) / 2 + w->x;
y = window_water_widgets[WIDX_PREVIEW].bottom + w->y + 5;
if (gWaterToolRaiseCost != MONEY32_UNDEFINED && gWaterToolRaiseCost != 0)
gfx_draw_string_centred(dpi, STR_RAISE_COST_AMOUNT, x, y, 0, &gWaterToolRaiseCost);
gfx_draw_string_centred(dpi, STR_RAISE_COST_AMOUNT, x, y, COLOUR_BLACK, &gWaterToolRaiseCost);
y += 10;
// Draw lower cost amount
if (gWaterToolLowerCost != MONEY32_UNDEFINED && gWaterToolLowerCost != 0)
gfx_draw_string_centred(dpi, STR_LOWER_COST_AMOUNT, x, y, 0, &gWaterToolLowerCost);
gfx_draw_string_centred(dpi, STR_LOWER_COST_AMOUNT, x, y, COLOUR_BLACK, &gWaterToolLowerCost);
}