From 46bfc92051e111d2a7efc9f43094c864f9bbdb3b Mon Sep 17 00:00:00 2001 From: Nat Quayle Nelson Date: Fri, 14 Mar 2025 09:05:00 -0500 Subject: [PATCH] Refactor: function to turn eFont into sf::Font --- src/gfx/render_text.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gfx/render_text.cpp b/src/gfx/render_text.cpp index 6c0ac67e..85fcba15 100644 --- a/src/gfx/render_text.cpp +++ b/src/gfx/render_text.cpp @@ -15,21 +15,21 @@ #include #include "winutil.hpp" -void TextStyle::applyTo(sf::Text& text, double scale) const { +sf::Font& get_font_rsrc(eFont font) { switch(font) { case FONT_PLAIN: - text.setFont(*ResMgr::fonts.get("plain")); - break; + return *ResMgr::fonts.get("plain"); case FONT_BOLD: - text.setFont(*ResMgr::fonts.get("bold")); - break; + return *ResMgr::fonts.get("bold"); case FONT_DUNGEON: - text.setFont(*ResMgr::fonts.get("dungeon")); - break; + return *ResMgr::fonts.get("dungeon"); case FONT_MAIDWORD: - text.setFont(*ResMgr::fonts.get("maidenword")); - break; + return *ResMgr::fonts.get("maidenword"); } +} + +void TextStyle::applyTo(sf::Text& text, double scale) const { + text.setFont(get_font_rsrc(font)); text.setCharacterSize(pointSize * scale); int style = sf::Text::Regular; if(italic) style |= sf::Text::Italic;