From 488e2a0c2e62f048aff3e4ab30dd35f734185687 Mon Sep 17 00:00:00 2001 From: Hash Borgir Date: Sun, 19 May 2024 19:35:35 -0600 Subject: [PATCH] close button working.Need to add misc pots --- .../loot_filter/loot_filter_settings.h | 2 ++ .../loot_filter/loot_filter_settings_menu.h | 2 ++ .../loot_filter_settings_toggle_menu.h | 5 +++- .../loot_filter/loot_filter_settings_menu.cpp | 23 +++++++++++++++++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/include/d2tweaks/client/modules/loot_filter/loot_filter_settings.h b/include/d2tweaks/client/modules/loot_filter/loot_filter_settings.h index 288cb49..6d42e09 100644 --- a/include/d2tweaks/client/modules/loot_filter/loot_filter_settings.h +++ b/include/d2tweaks/client/modules/loot_filter/loot_filter_settings.h @@ -106,6 +106,8 @@ namespace d2_tweaks { bool m_show_mp4; bool m_show_mp5; + bool m_show_close; + bool quality_settings[static_cast(diablo2::structures::item_quality_t::ITEM_QUALITY_COUNT)]; char reserved[1004]; diff --git a/include/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.h b/include/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.h index bcec854..909d05c 100644 --- a/include/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.h +++ b/include/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.h @@ -119,6 +119,7 @@ namespace d2_tweaks { ui::controls::checkbox* m_show_mp4; ui::controls::checkbox* m_show_mp5; + ui::controls::checkbox* m_close; void(__fastcall* m_draw_dropped_items_names_original)(void*, void*); void(__fastcall* m_handle_dropped_items_original)(void*, void*); @@ -220,6 +221,7 @@ namespace d2_tweaks { void extract_mp4(bool value); void extract_mp5(bool value); + void close_window(bool value); //void extract_flourite(bool value); diff --git a/include/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.h b/include/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.h index 5e6cc78..c07973f 100644 --- a/include/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.h +++ b/include/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.h @@ -22,11 +22,14 @@ namespace d2_tweaks { ui::controls::button* m_btn_toggle_stash; ui::controls::button* m_btn_toggle_bag; + + public: + menu* m_filter_settings_menu; menu* m_menu; bool m_show; bool m_show_bag; - public: + explicit loot_filter_settings_toggle_menu(token); void toggle_show() { diff --git a/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.cpp b/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.cpp index 7522e04..649a176 100644 --- a/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.cpp +++ b/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.cpp @@ -623,6 +623,14 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::register_misc_checkb m_show_mp4 = get_control("m_show_mp4"); m_show_mp5 = get_control("m_show_mp5"); + m_close = get_control("m_close"); + + + if (m_close) { + m_close->set_state(loot_filter_settings::get().m_show_close); + m_close->set_on_click(std::bind(&loot_filter_settings_menu::close_window, + this, std::placeholders::_1)); + } // potions { @@ -1190,6 +1198,21 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_item(bool va // potions +#include + +void d2_tweaks::client::modules::loot_filter_settings_menu::close_window(bool value) { + + auto& toggle_menu = singleton::instance(); + + toggle_menu.m_show = false; + + m_stats_enabled = true; + + toggle_menu.m_filter_settings_menu->set_enabled(false); + toggle_menu.m_filter_settings_menu->set_visible(false); + +} + void d2_tweaks::client::modules::loot_filter_settings_menu::extract_rejuv_potion(bool value) { loot_filter_settings::get().m_show_rejuv_potion = value; extract_item(value, 396, 1, 'rvs ', diablo2::UNIT_STAT_gembag_Potions);