From e1b778832b20933a9ff81011accc832afd5722fd Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 26 Aug 2020 14:44:30 +0200 Subject: [PATCH 1/8] Expose DrawTextBasic() and DrawTextEllipsised() --- src/openrct2/drawing/Drawing.h | 1 + src/openrct2/drawing/Text.cpp | 26 +++++++++++++------------- src/openrct2/drawing/Text.h | 7 +++++++ 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index 115ee6a4ac..cddf76c5b9 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -13,6 +13,7 @@ #include "../common.h" #include "../interface/Colour.h" #include "../interface/ZoomLevel.hpp" +#include "Text.h" #include #include diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index 34ae6faaf1..75269c50af 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -115,18 +115,18 @@ static void DrawText( DrawText(dpi, coords, paint, buffer); } -static void DrawTextCompat( +void DrawTextBasic( rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const void* args, uint8_t colour, - TextAlignment alignment, bool underline = false) + TextAlignment alignment, bool underline) { TextPaint textPaint = { colour, FONT_SPRITE_BASE_MEDIUM, underline, alignment }; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; DrawText(dpi, coords, textPaint, format, args); } -static void DrawTextEllipsisedCompat( +void DrawTextEllipsised( rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, void* args, uint8_t colour, - TextAlignment alignment, bool underline = false) + TextAlignment alignment, bool underline) { TextPaint textPaint = { colour, FONT_SPRITE_BASE_MEDIUM, underline, alignment }; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -148,56 +148,56 @@ void gfx_draw_string(rct_drawpixelinfo* dpi, const_utf8string buffer, uint8_t co void gfx_draw_string_left( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords) { - DrawTextCompat(dpi, coords, format, args, colour, TextAlignment::LEFT); + DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::LEFT); } void gfx_draw_string_centred( rct_drawpixelinfo* dpi, rct_string_id format, const ScreenCoordsXY& coords, uint8_t colour, const void* args) { - DrawTextCompat(dpi, coords, format, args, colour, TextAlignment::CENTRE); + DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::CENTRE); } void gfx_draw_string_right( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords) { - DrawTextCompat(dpi, coords, format, args, colour, TextAlignment::RIGHT); + DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::RIGHT); } // Underline void draw_string_left_underline( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords) { - DrawTextCompat(dpi, coords, format, args, colour, TextAlignment::LEFT, true); + DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::LEFT, true); } void draw_string_centred_underline( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords) { - DrawTextCompat(dpi, coords, format, args, colour, TextAlignment::CENTRE, true); + DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::CENTRE, true); } void draw_string_right_underline( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords) { - DrawTextCompat(dpi, coords, format, args, colour, TextAlignment::RIGHT, true); + DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::RIGHT, true); } // Ellipsised void gfx_draw_string_left_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width) { - DrawTextEllipsisedCompat(dpi, coords, width, format, args, colour, TextAlignment::LEFT); + DrawTextEllipsised(dpi, coords, width, format, args, colour, TextAlignment::LEFT); } void gfx_draw_string_centred_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width) { - DrawTextEllipsisedCompat(dpi, coords, width, format, args, colour, TextAlignment::CENTRE); + DrawTextEllipsised(dpi, coords, width, format, args, colour, TextAlignment::CENTRE); } void gfx_draw_string_right_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width) { - DrawTextEllipsisedCompat(dpi, coords, width, format, args, colour, TextAlignment::RIGHT); + DrawTextEllipsised(dpi, coords, width, format, args, colour, TextAlignment::RIGHT); } // Wrapping diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h index b668fd284e..86f3cea6ef 100644 --- a/src/openrct2/drawing/Text.h +++ b/src/openrct2/drawing/Text.h @@ -48,3 +48,10 @@ public: int32_t GetWidth(); int32_t GetLineCount(); }; + +void DrawTextBasic( + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const void* args, uint8_t colour, + TextAlignment alignment, bool underline = false); +void DrawTextEllipsised( + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, void* args, uint8_t colour, + TextAlignment alignment, bool underline = false); From 5f468da9cf2f26ee37f453ec07084ff60aba7640 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 26 Aug 2020 14:44:57 +0200 Subject: [PATCH 2/8] Remove draw_string_centred_underline() --- src/openrct2/drawing/Drawing.h | 2 -- src/openrct2/drawing/Text.cpp | 6 ------ 2 files changed, 8 deletions(-) diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index cddf76c5b9..ee1b3145c8 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -658,8 +658,6 @@ void gfx_draw_string_right( void draw_string_left_underline( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); -void draw_string_centred_underline( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); void draw_string_right_underline( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index 75269c50af..3c69c6fa71 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -169,12 +169,6 @@ void draw_string_left_underline( DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::LEFT, true); } -void draw_string_centred_underline( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords) -{ - DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::CENTRE, true); -} - void draw_string_right_underline( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords) { From f1caddc9feca7820398ece1c84d795bf87dcb7e0 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 26 Aug 2020 14:46:37 +0200 Subject: [PATCH 3/8] Remove draw_string_right_underline() --- src/openrct2-ui/windows/Finances.cpp | 7 ++++--- src/openrct2/drawing/Drawing.h | 2 -- src/openrct2/drawing/Text.cpp | 6 ------ 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 43fea6a86c..b734c4c682 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -755,9 +755,10 @@ static void window_finances_summary_scrollpaint(rct_window* w, rct_drawpixelinfo auto ft = Formatter::Common(); ft.Add(STR_FINANCES_SUMMARY_MONTH_HEADING); ft.Add(monthyear); - draw_string_right_underline( - dpi, monthyear == currentMonthYear ? STR_WINDOW_COLOUR_2_STRINGID : STR_BLACK_STRING, gCommonFormatArgs, - COLOUR_BLACK, screenCoords + ScreenCoordsXY{ EXPENDITURE_COLUMN_WIDTH, 0 }); + DrawTextBasic( + dpi, screenCoords + ScreenCoordsXY{ EXPENDITURE_COLUMN_WIDTH, 0 }, + monthyear == currentMonthYear ? STR_WINDOW_COLOUR_2_STRINGID : STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, + TextAlignment::RIGHT, true); screenCoords.y += 14; // Month expenditures diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index ee1b3145c8..e1e75e0532 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -658,8 +658,6 @@ void gfx_draw_string_right( void draw_string_left_underline( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); -void draw_string_right_underline( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); void gfx_draw_string_left_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width); diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index 3c69c6fa71..89139d3e4b 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -169,12 +169,6 @@ void draw_string_left_underline( DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::LEFT, true); } -void draw_string_right_underline( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords) -{ - DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::RIGHT, true); -} - // Ellipsised void gfx_draw_string_left_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width) From ceace1a3ad3f41ecea61f06cb163b5267410be79 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 26 Aug 2020 14:47:47 +0200 Subject: [PATCH 4/8] Remove draw_string_left_underline() --- src/openrct2-ui/windows/Finances.cpp | 2 +- src/openrct2/drawing/Drawing.h | 3 --- src/openrct2/drawing/Text.cpp | 6 ------ 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index b734c4c682..1fa19bab94 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -669,7 +669,7 @@ static void window_finances_summary_paint(rct_window* w, rct_drawpixelinfo* dpi) auto screenCoords = w->windowPos + ScreenCoordsXY{ 8, 51 }; // Expenditure / Income heading - draw_string_left_underline(dpi, STR_FINANCES_SUMMARY_EXPENDITURE_INCOME, nullptr, COLOUR_BLACK, screenCoords); + DrawTextBasic(dpi, screenCoords, STR_FINANCES_SUMMARY_EXPENDITURE_INCOME, nullptr, COLOUR_BLACK, TextAlignment::LEFT, true); screenCoords.y += 14; // Expenditure / Income row labels diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index e1e75e0532..d3dabf1fe9 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -656,9 +656,6 @@ void gfx_draw_string_centred( void gfx_draw_string_right( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); -void draw_string_left_underline( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); - void gfx_draw_string_left_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width); void gfx_draw_string_centred_clipped( diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index 89139d3e4b..42d01f0695 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -162,12 +162,6 @@ void gfx_draw_string_right( { DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::RIGHT); } -// Underline -void draw_string_left_underline( - rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords) -{ - DrawTextBasic(dpi, coords, format, args, colour, TextAlignment::LEFT, true); -} // Ellipsised void gfx_draw_string_left_clipped( From 9a31a94128a5826b26739a5bec5c19b02b4dcd57 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 26 Aug 2020 14:48:27 +0200 Subject: [PATCH 5/8] Use const args in DrawTextEllipsised() --- src/openrct2/drawing/Text.cpp | 2 +- src/openrct2/drawing/Text.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index 42d01f0695..691a06d785 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -125,7 +125,7 @@ void DrawTextBasic( } void DrawTextEllipsised( - rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, void* args, uint8_t colour, + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const void* args, uint8_t colour, TextAlignment alignment, bool underline) { TextPaint textPaint = { colour, FONT_SPRITE_BASE_MEDIUM, underline, alignment }; diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h index 86f3cea6ef..9dfb297a8f 100644 --- a/src/openrct2/drawing/Text.h +++ b/src/openrct2/drawing/Text.h @@ -53,5 +53,5 @@ void DrawTextBasic( rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const void* args, uint8_t colour, TextAlignment alignment, bool underline = false); void DrawTextEllipsised( - rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, void* args, uint8_t colour, + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const void* args, uint8_t colour, TextAlignment alignment, bool underline = false); From 39bc73c394a3125dd92ebd9b43087cbbca5a8d1f Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 26 Aug 2020 14:53:59 +0200 Subject: [PATCH 6/8] Deprecate text draw functions with 1:1 replacements --- src/openrct2/drawing/Drawing.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index d3dabf1fe9..c3c1465048 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -649,17 +649,23 @@ void FASTCALL gfx_draw_sprite_raw_masked_software( // string void gfx_draw_string(rct_drawpixelinfo* dpi, const_utf8string buffer, uint8_t colour, const ScreenCoordsXY& coords); +/** @deprecated */ void gfx_draw_string_left( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); +/** @deprecated */ void gfx_draw_string_centred( rct_drawpixelinfo* dpi, rct_string_id format, const ScreenCoordsXY& coords, uint8_t colour, const void* args); +/** @deprecated */ void gfx_draw_string_right( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords); +/** @deprecated */ void gfx_draw_string_left_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width); +/** @deprecated */ void gfx_draw_string_centred_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width); +/** @deprecated */ void gfx_draw_string_right_clipped( rct_drawpixelinfo* dpi, rct_string_id format, void* args, uint8_t colour, const ScreenCoordsXY& coords, int32_t width); From 972e6e80abb6393d4b40ea446c6bb6b9a8851a2a Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 26 Aug 2020 14:57:49 +0200 Subject: [PATCH 7/8] Allow passing Formatter to DrawTextBasic() and DrawTextEllipsised() --- src/openrct2-ui/windows/Finances.cpp | 2 +- src/openrct2/drawing/Text.cpp | 14 ++++++++++++++ src/openrct2/drawing/Text.h | 7 +++++++ src/openrct2/localisation/Localisation.h | 5 +++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/openrct2-ui/windows/Finances.cpp b/src/openrct2-ui/windows/Finances.cpp index 1fa19bab94..879fa9025f 100644 --- a/src/openrct2-ui/windows/Finances.cpp +++ b/src/openrct2-ui/windows/Finances.cpp @@ -757,7 +757,7 @@ static void window_finances_summary_scrollpaint(rct_window* w, rct_drawpixelinfo ft.Add(monthyear); DrawTextBasic( dpi, screenCoords + ScreenCoordsXY{ EXPENDITURE_COLUMN_WIDTH, 0 }, - monthyear == currentMonthYear ? STR_WINDOW_COLOUR_2_STRINGID : STR_BLACK_STRING, gCommonFormatArgs, COLOUR_BLACK, + monthyear == currentMonthYear ? STR_WINDOW_COLOUR_2_STRINGID : STR_BLACK_STRING, ft, COLOUR_BLACK, TextAlignment::RIGHT, true); screenCoords.y += 14; diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index 691a06d785..febe97646d 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -124,6 +124,13 @@ void DrawTextBasic( DrawText(dpi, coords, textPaint, format, args); } +void DrawTextBasic( + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const Formatter& ft, uint8_t colour, + TextAlignment alignment, bool underline) +{ + return DrawTextBasic(dpi, coords, format, ft.GetStartBuf(), colour, alignment, underline); +} + void DrawTextEllipsised( rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const void* args, uint8_t colour, TextAlignment alignment, bool underline) @@ -138,6 +145,13 @@ void DrawTextEllipsised( DrawText(dpi, coords, textPaint, buffer); } +void DrawTextEllipsised( + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const Formatter& ft, + uint8_t colour, TextAlignment alignment, bool underline) +{ + return DrawTextEllipsised(dpi, coords, width, format, ft.GetStartBuf(), colour, alignment, underline); +} + void gfx_draw_string(rct_drawpixelinfo* dpi, const_utf8string buffer, uint8_t colour, const ScreenCoordsXY& coords) { TextPaint textPaint = { colour, gCurrentFontSpriteBase, false, TextAlignment::LEFT }; diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h index 9dfb297a8f..85ca4ccc4d 100644 --- a/src/openrct2/drawing/Text.h +++ b/src/openrct2/drawing/Text.h @@ -13,6 +13,7 @@ struct ScreenCoordsXY; struct rct_drawpixelinfo; +class Formatter; enum class TextAlignment { @@ -49,9 +50,15 @@ public: int32_t GetLineCount(); }; +void DrawTextBasic( + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const Formatter& ft, uint8_t colour, + TextAlignment alignment, bool underline = false); void DrawTextBasic( rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const void* args, uint8_t colour, TextAlignment alignment, bool underline = false); +void DrawTextEllipsised( + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const Formatter& ft, + uint8_t colour, TextAlignment alignment, bool underline = false); void DrawTextEllipsised( rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const void* args, uint8_t colour, TextAlignment alignment, bool underline = false); diff --git a/src/openrct2/localisation/Localisation.h b/src/openrct2/localisation/Localisation.h index ef94fa3d87..63c2ab5570 100644 --- a/src/openrct2/localisation/Localisation.h +++ b/src/openrct2/localisation/Localisation.h @@ -112,6 +112,11 @@ public: return CurrentBuf; } + auto GetStartBuf() const + { + return StartBuf; + } + void Increment(size_t count) { CurrentBuf += count; From 17bac8c57bc2c489fd2664f5ee720041bf5e3ef5 Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Wed, 26 Aug 2020 15:38:27 +0200 Subject: [PATCH 8/8] Use colour_t --- src/openrct2/drawing/Text.cpp | 10 +++++----- src/openrct2/drawing/Text.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index febe97646d..6d8cbd930c 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -116,7 +116,7 @@ static void DrawText( } void DrawTextBasic( - rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const void* args, uint8_t colour, + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const void* args, colour_t colour, TextAlignment alignment, bool underline) { TextPaint textPaint = { colour, FONT_SPRITE_BASE_MEDIUM, underline, alignment }; @@ -125,15 +125,15 @@ void DrawTextBasic( } void DrawTextBasic( - rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const Formatter& ft, uint8_t colour, + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const Formatter& ft, colour_t colour, TextAlignment alignment, bool underline) { return DrawTextBasic(dpi, coords, format, ft.GetStartBuf(), colour, alignment, underline); } void DrawTextEllipsised( - rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const void* args, uint8_t colour, - TextAlignment alignment, bool underline) + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const void* args, + colour_t colour, TextAlignment alignment, bool underline) { TextPaint textPaint = { colour, FONT_SPRITE_BASE_MEDIUM, underline, alignment }; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; @@ -147,7 +147,7 @@ void DrawTextEllipsised( void DrawTextEllipsised( rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const Formatter& ft, - uint8_t colour, TextAlignment alignment, bool underline) + colour_t colour, TextAlignment alignment, bool underline) { return DrawTextEllipsised(dpi, coords, width, format, ft.GetStartBuf(), colour, alignment, underline); } diff --git a/src/openrct2/drawing/Text.h b/src/openrct2/drawing/Text.h index 85ca4ccc4d..577db97a41 100644 --- a/src/openrct2/drawing/Text.h +++ b/src/openrct2/drawing/Text.h @@ -51,14 +51,14 @@ public: }; void DrawTextBasic( - rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const Formatter& ft, uint8_t colour, + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const Formatter& ft, colour_t colour, TextAlignment alignment, bool underline = false); void DrawTextBasic( - rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const void* args, uint8_t colour, + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, rct_string_id format, const void* args, colour_t colour, TextAlignment alignment, bool underline = false); void DrawTextEllipsised( rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const Formatter& ft, - uint8_t colour, TextAlignment alignment, bool underline = false); + colour_t colour, TextAlignment alignment, bool underline = false); void DrawTextEllipsised( - rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const void* args, uint8_t colour, - TextAlignment alignment, bool underline = false); + rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords, int32_t width, rct_string_id format, const void* args, + colour_t colour, TextAlignment alignment, bool underline = false);