From 4600940fbcf425366a58399871e3f7fbb5b52c8e Mon Sep 17 00:00:00 2001 From: Hash Borgir Date: Wed, 17 Apr 2024 22:52:38 -0600 Subject: [PATCH] All working. --- .../modules/autosort/autosort_client.cpp | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/src/d2tweaks/client/modules/autosort/autosort_client.cpp b/src/d2tweaks/client/modules/autosort/autosort_client.cpp index bf6a196..fba30aa 100644 --- a/src/d2tweaks/client/modules/autosort/autosort_client.cpp +++ b/src/d2tweaks/client/modules/autosort/autosort_client.cpp @@ -43,7 +43,7 @@ #include #include #include - +#include #include @@ -70,6 +70,25 @@ enum ColorEnum { LIGHT_GREY = diablo2::ui_color_t::UI_COLOR_LIGHT_GREY }; +// Mapping from int to ui_font_t +std::map fontMap = { + {0, diablo2::ui_font_t::UI_FONT_8}, + {1, diablo2::ui_font_t::UI_FONT_16}, + {2, diablo2::ui_font_t::UI_FONT_30}, + {3, diablo2::ui_font_t::UI_FONT_42}, + {4, diablo2::ui_font_t::UI_FONT_FORMAL10}, + {5, diablo2::ui_font_t::UI_FONT_FORMAL12}, + {6, diablo2::ui_font_t::UI_FONT_6}, + {7, diablo2::ui_font_t::UI_FONT_24}, + {8, diablo2::ui_font_t::UI_FONT_FORMAL11}, + {9, diablo2::ui_font_t::UI_FONT_EXOCET10}, + {10, diablo2::ui_font_t::UI_FONT_RIDICULOUS}, + {11, diablo2::ui_font_t::UI_FONT_EXOCET8}, + {12, diablo2::ui_font_t::UI_FONT_REALLYTHELASTSUCKER}, + {13, diablo2::ui_font_t::UI_FONT_INGAMECHAT} +}; + + class inventory_sort_menu : public d2_tweaks::ui::menu { d2_tweaks::common::asset* m_buttons_img; @@ -1138,6 +1157,7 @@ public: }; + int statsFont = GetPrivateProfileIntA("Options", "statsFont", 0, "./d2tweaks.ini"); void OnLoad() { srand(time(NULL)); @@ -1344,15 +1364,15 @@ public: && !diablo2::d2_client::get_ui_window_state(diablo2::UI_WINDOW_SCROLL)) { // Draw stats - diablo2::d2_win::set_current_font(diablo2::UI_FONT_6); // Set font to FONT16 + diablo2::d2_win::set_current_font(fontMap[statsFont]); // Set font to FONT16 diablo2::d2_win::draw_text(const_cast(statText.c_str()), stat.x1, stat.y1 + textOffset, stat.colorStat, 0); - diablo2::d2_win::set_current_font(diablo2::UI_FONT_6); // Set font to FONT16 + diablo2::d2_win::set_current_font(fontMap[statsFont]); // Set font to FONT16 diablo2::d2_win::draw_text(const_cast(statValueStr.c_str()), stat.x2, stat.y2 + textOffset, stat.colorStatValue, 0); //diablo2::d2_win::draw_boxed_text(const_cast(statText.c_str()), stat.x1, stat.y1 + textOffset, 1, 0, stat.colorStat); - //diablo2::d2_win::draw_boxed_text(const_cast(statValueStr.c_str()), stat.x2, stat.y2 + textOffset, 1, 1, statValueColor); + //diablo2::d2_win::draw_boxed_text(const_cast(statValueStr.c_str()), stat.x2, stat.y2 + textOffset, 1, 4, stat.colorStatValue); // diablo2::d2_win::set_current_font(diablo2::UI_FONT_16); // Set font to FONT16