mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-02 03:35:09 +01:00
Code Issues Releases Wiki Activity

Reduce usage of gCurrentFontSpriteBase

Browse Source
This commit is contained in:
Gymnasiast
2021-02-27 17:43:23 +01:00
parent 3e536e2711
commit 826f6c7442
10 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2/drawing/Drawing.String.cpp
View File

@@ -170,7 +170,7 @@ int32_t gfx_clip_string(utf8* text, int32_t width)
* num_lines (edi) - out
* font_height (ebx) - out
*/
int32_t gfx_wrap_string(utf8* text, int32_t width, int32_t* outNumLines, FontSpriteBase* outFontHeight)
int32_t gfx_wrap_string(utf8* text, int32_t width, int32_t* outNumLines)
{
constexpr size_t NULL_INDEX = std::numeric_limits<size_t>::max();
thread_local std::string buffer;
@@ -259,7 +259,6 @@ int32_t gfx_wrap_string(utf8* text, int32_t width, int32_t* outNumLines, FontSpr
std::memcpy(text, buffer.data(), buffer.size() + 1);
*outNumLines = static_cast<int32_t>(numLines);
*outFontHeight = gCurrentFontSpriteBase;
return maxWidth;
}
@@ -272,7 +271,7 @@ void gfx_draw_string_left_centred(
gCurrentFontSpriteBase = FontSpriteBase::MEDIUM;
char* buffer = gCommonStringFormatBuffer;
format_string(buffer, 256, format, args);
int32_t height = string_get_height_raw(buffer);
int32_t height = string_get_height_raw(buffer, FontSpriteBase::MEDIUM);
gfx_draw_string(dpi, buffer, colour, coords - ScreenCoordsXY{ 0, (height / 2) });
}
@@ -352,14 +351,12 @@ void draw_string_centred_raw(rct_drawpixelinfo* dpi, const ScreenCoordsXY& coord
}
text = const_cast<char*>(ch + 1);
screenCoords.y += font_get_line_height(gCurrentFontSpriteBase);
screenCoords.y += font_get_line_height(FontSpriteBase::MEDIUM);
}
}
int32_t string_get_height_raw(std::string_view text)
int32_t string_get_height_raw(std::string_view text, FontSpriteBase fontBase)
{
auto fontBase = gCurrentFontSpriteBase;
int32_t height = 0;
if (fontBase <= FontSpriteBase::MEDIUM)
height += 10;
@@ -431,7 +428,6 @@ void gfx_draw_string_centred_wrapped_partial(
int32_t ticks)
{
int32_t numLines, lineHeight, lineY;
FontSpriteBase fontSpriteBase;
utf8* buffer = gCommonStringFormatBuffer;
ScreenCoordsXY screenCoords(dpi->x, dpi->y);
@@ -440,8 +436,8 @@ void gfx_draw_string_centred_wrapped_partial(
format_string(buffer, 256, format, args);
gCurrentFontSpriteBase = FontSpriteBase::MEDIUM;
gfx_wrap_string(buffer, width, &numLines, &fontSpriteBase);
lineHeight = font_get_line_height(fontSpriteBase);
gfx_wrap_string(buffer, width, &numLines);
lineHeight = font_get_line_height(FontSpriteBase::MEDIUM);
int32_t numCharactersDrawn = 0;
int32_t numCharactersToDraw = ticks;