From 9ff2138f3f53784170c24fd5c9e6061c369df433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=B6eh=20Matt?= Date: Sat, 30 Jan 2021 17:46:22 +0200 Subject: [PATCH] Remove unused variable gCurrentFontFlags --- src/openrct2-ui/interface/InGameConsole.cpp | 1 - src/openrct2-ui/interface/Widget.cpp | 1 - src/openrct2-ui/windows/Changelog.cpp | 1 - src/openrct2-ui/windows/TextInput.cpp | 1 - src/openrct2/drawing/Drawing.String.cpp | 10 +++------- src/openrct2/drawing/Drawing.cpp | 1 - src/openrct2/drawing/Drawing.h | 1 - src/openrct2/drawing/Text.cpp | 2 -- src/openrct2/interface/Chat.cpp | 4 ---- 9 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/openrct2-ui/interface/InGameConsole.cpp b/src/openrct2-ui/interface/InGameConsole.cpp index 4cc518437d..759956d1db 100644 --- a/src/openrct2-ui/interface/InGameConsole.cpp +++ b/src/openrct2-ui/interface/InGameConsole.cpp @@ -267,7 +267,6 @@ void InGameConsole::Draw(rct_drawpixelinfo* dpi) const // Set font gCurrentFontSpriteBase = (gConfigInterface.console_small_font ? FONT_SPRITE_BASE_SMALL : FONT_SPRITE_BASE_MEDIUM); - gCurrentFontFlags = 0; uint8_t textColour = NOT_TRANSLUCENT(ThemeGetColour(WC_CONSOLE, 1)); const int32_t lineHeight = font_get_line_height(gCurrentFontSpriteBase); const int32_t maxLines = GetNumVisibleLines(); diff --git a/src/openrct2-ui/interface/Widget.cpp b/src/openrct2-ui/interface/Widget.cpp index 189cb44cac..5e04864630 100644 --- a/src/openrct2-ui/interface/Widget.cpp +++ b/src/openrct2-ui/interface/Widget.cpp @@ -1093,7 +1093,6 @@ static void WidgetTextBoxDraw(rct_drawpixelinfo* dpi, rct_window* w, rct_widgeti gfx_fill_rect_inset(dpi, { topLeft, bottomRight }, colour, INSET_RECT_F_60); gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - gCurrentFontFlags = 0; // Figure out where the text should be positioned vertically. topLeft.y = w->windowPos.y + widget->textTop(); diff --git a/src/openrct2-ui/windows/Changelog.cpp b/src/openrct2-ui/windows/Changelog.cpp index 5fd532d283..243955cc62 100644 --- a/src/openrct2-ui/windows/Changelog.cpp +++ b/src/openrct2-ui/windows/Changelog.cpp @@ -213,7 +213,6 @@ static void window_changelog_paint(rct_window* w, rct_drawpixelinfo* dpi) static void window_changelog_scrollpaint(rct_window* w, rct_drawpixelinfo* dpi, [[maybe_unused]] int32_t scrollIndex) { - gCurrentFontFlags = 0; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; const int32_t lineHeight = font_get_line_height(gCurrentFontSpriteBase); diff --git a/src/openrct2-ui/windows/TextInput.cpp b/src/openrct2-ui/windows/TextInput.cpp index da444e3fb2..89fddb39b9 100644 --- a/src/openrct2-ui/windows/TextInput.cpp +++ b/src/openrct2-ui/windows/TextInput.cpp @@ -241,7 +241,6 @@ static void window_text_input_paint(rct_window* w, rct_drawpixelinfo* dpi) screenCoords.y += 25; gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; - gCurrentFontFlags = 0; char wrapped_string[TEXT_INPUT_SIZE]; safe_strcpy(wrapped_string, text_input, TEXT_INPUT_SIZE); diff --git a/src/openrct2/drawing/Drawing.String.cpp b/src/openrct2/drawing/Drawing.String.cpp index ca185200cf..84f9eea202 100644 --- a/src/openrct2/drawing/Drawing.String.cpp +++ b/src/openrct2/drawing/Drawing.String.cpp @@ -337,7 +337,6 @@ void draw_string_centred_raw(rct_drawpixelinfo* dpi, const ScreenCoordsXY& coord gCurrentFontSpriteBase = FONT_SPRITE_BASE_MEDIUM; gfx_draw_string(dpi, "", COLOUR_BLACK, screenCoords); screenCoords = coords; - gCurrentFontFlags = 0; for (int32_t i = 0; i <= numLines; i++) { @@ -446,7 +445,6 @@ void gfx_draw_string_centred_wrapped_partial( int32_t numCharactersDrawn = 0; int32_t numCharactersToDraw = ticks; - gCurrentFontFlags = 0; lineY = coords.y - ((numLines * lineHeight) / 2); for (int32_t line = 0; line <= numLines; line++) { @@ -942,7 +940,7 @@ void ttf_draw_string( text_draw_info info; info.font_sprite_base = gCurrentFontSpriteBase; - info.flags = gCurrentFontFlags; + info.flags = 0; info.startX = coords.x; info.startY = coords.y; info.x = coords.x; @@ -964,7 +962,6 @@ void ttf_draw_string( std::memcpy(text_palette, info.palette, sizeof(info.palette)); gCurrentFontSpriteBase = info.font_sprite_base; - gCurrentFontFlags = info.flags; gLastDrawStringX = info.x; gLastDrawStringY = info.y; @@ -974,7 +971,7 @@ static int32_t ttf_get_string_width(std::string_view text, bool noFormatting) { text_draw_info info; info.font_sprite_base = gCurrentFontSpriteBase; - info.flags = gCurrentFontFlags; + info.flags = 0; info.startX = 0; info.startY = 0; info.x = 0; @@ -1008,7 +1005,7 @@ void gfx_draw_string_with_y_offsets( { text_draw_info info; info.font_sprite_base = gCurrentFontSpriteBase; - info.flags = gCurrentFontFlags; + info.flags = 0; info.startX = coords.x; info.startY = coords.y; info.x = coords.x; @@ -1028,7 +1025,6 @@ void gfx_draw_string_with_y_offsets( std::memcpy(text_palette, info.palette, sizeof(info.palette)); gCurrentFontSpriteBase = info.font_sprite_base; - gCurrentFontFlags = info.flags; gLastDrawStringX = info.x; gLastDrawStringY = info.y; diff --git a/src/openrct2/drawing/Drawing.cpp b/src/openrct2/drawing/Drawing.cpp index fccb9a82fb..d659a28cf5 100644 --- a/src/openrct2/drawing/Drawing.cpp +++ b/src/openrct2/drawing/Drawing.cpp @@ -86,7 +86,6 @@ thread_local int32_t gLastDrawStringX; thread_local int32_t gLastDrawStringY; thread_local int16_t gCurrentFontSpriteBase; -thread_local uint16_t gCurrentFontFlags; uint8_t gGamePalette[256 * 4]; uint32_t gPaletteEffectFrame; diff --git a/src/openrct2/drawing/Drawing.h b/src/openrct2/drawing/Drawing.h index 493bcc0884..5ce7c36321 100644 --- a/src/openrct2/drawing/Drawing.h +++ b/src/openrct2/drawing/Drawing.h @@ -645,7 +645,6 @@ void FASTCALL BlitPixels(const uint8_t* src, uint8_t* dst, const PaletteMap& pal #define MAX_SCROLLING_TEXT_MODES 38 extern thread_local int16_t gCurrentFontSpriteBase; -extern thread_local uint16_t gCurrentFontFlags; extern GamePalette gPalette; extern uint8_t gGamePalette[256 * 4]; diff --git a/src/openrct2/drawing/Text.cpp b/src/openrct2/drawing/Text.cpp index 77736be622..4c349747e8 100644 --- a/src/openrct2/drawing/Text.cpp +++ b/src/openrct2/drawing/Text.cpp @@ -33,12 +33,10 @@ StaticLayout::StaticLayout(utf8string source, const TextPaint& paint, int32_t wi void StaticLayout::Draw(rct_drawpixelinfo* dpi, const ScreenCoordsXY& coords) { - gCurrentFontFlags = 0; gCurrentFontSpriteBase = Paint.SpriteBase; TextPaint tempPaint = Paint; - gCurrentFontFlags = 0; auto lineCoords = coords; switch (Paint.Alignment) { diff --git a/src/openrct2/interface/Chat.cpp b/src/openrct2/interface/Chat.cpp index 43f6ae44e3..00cdf01197 100644 --- a/src/openrct2/interface/Chat.cpp +++ b/src/openrct2/interface/Chat.cpp @@ -279,8 +279,6 @@ static int32_t chat_history_draw_string( gfx_wrap_string(buffer, width, &numLines, &fontSpriteBase); auto lineHeight = font_get_line_height(fontSpriteBase); - gCurrentFontFlags = 0; - int32_t expectedY = screenCoords.y - (numLines * lineHeight); if (expectedY < 50) { @@ -312,8 +310,6 @@ int32_t chat_string_wrapped_get_height(void* args, int32_t width) gfx_wrap_string(buffer, width, &numLines, &fontSpriteBase); lineHeight = font_get_line_height(fontSpriteBase); - gCurrentFontFlags = 0; - lineY = 0; for (int32_t line = 0; line <= numLines; ++line) {