mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 00:04:43 +01:00
Code Issues Releases Wiki Activity

Use more constants for text colours

Browse Source
This commit is contained in:
Marijn van der Werf
2016-11-13 18:44:34 +01:00
committed by Ted John
parent 022b481d66
commit 1a8cb9fc57
14 changed files with 95 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/interface/colour.h
View File

@@ -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)

2
src/interface/console.c
View File

@@ -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;

14
src/interface/widget.c
View File

@@ -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);