mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Turn font sprite base into a strong enum

Browse Source
This commit is contained in:
Gymnasiast
2021-02-27 12:40:20 +01:00
parent 582037bbf3
commit 2477933c51
40 changed files with 149 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/openrct2/interface/Chat.cpp
View File

@@ -274,8 +274,9 @@ static int32_t chat_history_draw_string(
auto buffer = gCommonStringFormatBuffer;
FormatStringToBuffer(gCommonStringFormatBuffer, sizeof(gCommonStringFormatBuffer), "{OUTLINE}{WHITE}{STRING}", text);
int32_t fontSpriteBase, numLines;
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
int32_t numLines;
FontSpriteBase fontSpriteBase;
gCurrentFontSpriteBase = FontSpriteBase::MEDIUM;
gfx_wrap_string(buffer, width, &numLines, &fontSpriteBase);
auto lineHeight = font_get_line_height(fontSpriteBase);
@@ -299,14 +300,15 @@ static int32_t chat_history_draw_string(
// Almost the same as gfx_draw_string_left_wrapped
int32_t chat_string_wrapped_get_height(void* args, int32_t width)
{
int32_t fontSpriteBase, lineHeight, lineY, numLines;
int32_t lineHeight, lineY, numLines;
FontSpriteBase fontSpriteBase;
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
gCurrentFontSpriteBase = FontSpriteBase::MEDIUM;
char* buffer = gCommonStringFormatBuffer;
format_string(buffer, 256, STR_STRING, args);
gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM;
gCurrentFontSpriteBase = FontSpriteBase::MEDIUM;
gfx_wrap_string(buffer, width, &numLines, &fontSpriteBase);
lineHeight = font_get_line_height(fontSpriteBase);