PublicArchive/OpenRCT2
2
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2026-05-06 07:56:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Change argument order to DrawText() to match the others

Browse Source
This commit is contained in:
Gymnasiast
2026-03-22 13:26:57 +01:00
parent 38adb756ee
commit 4e074db8df
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/openrct2/drawing/Drawing.String.cpp
+1 -2
View File
@@ -462,8 +462,7 @@ void DrawNewsTicker(
}
screenCoords = { coords.x - halfWidth, lineY };
DrawTextBasic(rt, screenCoords, buffer, kColourNull, FontStyle::small
});
DrawTextBasic(rt, screenCoords, buffer, { kColourNull, FontStyle::small });
if (numCharactersDrawn > numCharactersToDraw)
{
src/openrct2/drawing/Text.cpp
+5 -5
View File
@@ -80,7 +80,7 @@ public:
};
static void DrawText(
RenderTarget& rt, const ScreenCoordsXY& coords, const TextPaint& paint, u8string_view text, bool noFormatting = false)
RenderTarget& rt, const ScreenCoordsXY& coords, u8string_view text, const TextPaint& paint, bool noFormatting = false)
{
int32_t width = noFormatting ? GfxGetStringWidthNoFormatting(text, paint.FontStyle)
: GfxGetStringWidth(text, paint.FontStyle);
@@ -116,7 +116,7 @@ static void DrawText(
void DrawTextNoFormatting(RenderTarget& rt, const ScreenCoordsXY& coords, u8string_view string, TextPaint textPaint)
{
DrawText(rt, coords, textPaint, string, true);
DrawText(rt, coords, string, textPaint, true);
}
void DrawTextBasic(RenderTarget& rt, const ScreenCoordsXY& coords, StringId format, TextPaint textPaint)
@@ -128,12 +128,12 @@ void DrawTextBasic(RenderTarget& rt, const ScreenCoordsXY& coords, StringId form
{
utf8 buffer[512];
FormatStringLegacy(buffer, sizeof(buffer), format, ft.Data());
DrawText(rt, coords, textPaint, buffer);
DrawText(rt, coords, buffer, textPaint);
}
void DrawTextBasic(RenderTarget& rt, const ScreenCoordsXY& coords, u8string_view string, TextPaint textPaint)
{
DrawText(rt, coords, textPaint, string);
DrawText(rt, coords, string, textPaint);
}
void DrawTextEllipsised(RenderTarget& rt, const ScreenCoordsXY& coords, int32_t width, StringId format, TextPaint textPaint)
@@ -152,7 +152,7 @@ void DrawTextEllipsised(
void DrawTextEllipsised(RenderTarget& rt, const ScreenCoordsXY& coords, int32_t width, u8string string, TextPaint textPaint)
{
GfxClipString(const_cast<utf8*>(string.c_str()), width, textPaint.FontStyle);
DrawText(rt, coords, textPaint, string);
DrawText(rt, coords, string, textPaint);
}
int32_t DrawTextWrapped(RenderTarget& rt, const ScreenCoordsXY& coords, int32_t width, StringId format, TextPaint textPaint)
src/openrct2/drawing/Text.h
+2 -1
View File
@@ -210,7 +210,8 @@ struct TextPaint
}
};
void DrawTextNoFormatting(OpenRCT2::Drawing::RenderTarget& rt, const ScreenCoordsXY& coords, u8string_view string, TextPaint textPaint = {});
void DrawTextNoFormatting(
OpenRCT2::Drawing::RenderTarget& rt, const ScreenCoordsXY& coords, u8string_view string, TextPaint textPaint = {});
void DrawTextBasic(
OpenRCT2::Drawing::RenderTarget& rt, const ScreenCoordsXY& coords, StringId format, TextPaint textPaint = {});