mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-29 17:54:50 +01:00
Code Issues Releases Wiki Activity

Use constant for black strings

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

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);
}
/**