diff --git a/build/Debug/D2tweaks.Build.CppClean.log b/build/Debug/D2tweaks.Build.CppClean.log new file mode 100644 index 0000000..d6a8f99 --- /dev/null +++ b/build/Debug/D2tweaks.Build.CppClean.log @@ -0,0 +1,77 @@ +d:\vscode\d2tweaks-rnd2k\build\debug\src\common\asm_code.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\common\hooking.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2win.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2gfx.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2client.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2common.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2lang.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2game.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2net.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\controls\checkbox.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\controls\image.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\controls\label.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\controls\button.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\loot_filter\loot_filter.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\loot_filter\loot_filter_settings_toggle_menu.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\loot_filter\loot_filter_settings_menu.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\common\string_utils.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\common\config.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\common\ini.obj +d:\vscode\d2tweaks-rnd2k\build\debug\vc143.pdb +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\client_module.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\small_patches\small_patches.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\common\common.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\common\asset_manager.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\server_module.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\server.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\controls\group.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\menu.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\ui\ui_manager.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2launch.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\fog.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\storm.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\d2cmp.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\utils\mpq_ifstream.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\diablo2\utils\screen.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\main.obj +d:\vscode\d2tweaks-rnd2k\build\debug\vendor\d2template\d2template.obj +d:\vscode\d2tweaks-rnd2k\build\debug\vendor\dllnotify\dllnotify.obj +d:\vscode\d2tweaks-rnd2k\build\debug\vendor\minhook\src\buffer.obj +d:\vscode\d2tweaks-rnd2k\build\debug\vendor\minhook\src\hook.obj +d:\vscode\d2tweaks-rnd2k\build\debug\vendor\minhook\src\trampoline.obj +d:\vscode\d2tweaks-rnd2k\build\debug\vendor\minhook\src\hde\hde32.obj +d:\vscode\d2tweaks-rnd2k\build\debug\vendor\minhook\src\hde\hde64.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\client.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\autosort\autosort_client.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\auto_gold_pickup\auto_gold_pickup_client.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\auto_item_pickup\auto_item_pickup_client.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\damage_display\damage_display_client.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\item_drop_message\item_drop_message_client.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\item_move\item_move_client.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\loot_filter\loot_filter_settings.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\test\test.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\trader_update\trader_update_client.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\client\modules\transmute\transmute_client.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\autosort\autosort_server.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\auto_gold_pickup\auto_gold_pickup_server.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\auto_item_pickup\auto_item_pickup_server.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\damage_display\damage_display_server.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\identify_on_pickup\identify_on_pickup_server.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\item_drop_message\item_drop_message_server.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\item_move\item_move_server.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\test\test.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\trader_update\trader_update_server.obj +d:\vscode\d2tweaks-rnd2k\build\debug\src\d2tweaks\server\modules\transmute\transmute_server.obj +d:\diablo ii\mods\ironman-dev\d2tweaks.dll +d:\diablo ii\mods\ironman-dev\d2tweaks.pdb +d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.ilk +d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.pdb +d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.vcxproj.filelistabsolute.txt +d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\cl.command.1.tlog +d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\cl.items.tlog +d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\cl.read.1.tlog +d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\cl.write.1.tlog +d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\link.command.1.tlog +d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\link.read.1.tlog +d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\link.secondary.1.tlog +d:\vscode\d2tweaks-rnd2k\build\debug\d2tweaks.tlog\link.write.1.tlog diff --git a/build/Debug/D2tweaks.dll b/build/Debug/D2tweaks.dll deleted file mode 100644 index 53fd4ce..0000000 Binary files a/build/Debug/D2tweaks.dll and /dev/null differ diff --git a/build/Debug/D2tweaks.ilk b/build/Debug/D2tweaks.ilk index 8123b65..91612fa 100644 Binary files a/build/Debug/D2tweaks.ilk and b/build/Debug/D2tweaks.ilk differ diff --git a/build/Debug/D2tweaks.log b/build/Debug/D2tweaks.log index cfefdbc..1980c00 100644 --- a/build/Debug/D2tweaks.log +++ b/build/Debug/D2tweaks.log @@ -1,39 +1,2 @@ - client.cpp - autosort_client.cpp -D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\autosort\autosort_client.cpp(197,15): warning C4018: '<': signed/unsigned mismatch -D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\autosort\autosort_client.cpp(197,66): warning C4018: '<=': signed/unsigned mismatch - auto_gold_pickup_client.cpp - auto_item_pickup_client.cpp - damage_display_client.cpp -D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\damage_display\damage_display_client.cpp(135,12): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data -D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\damage_display\damage_display_client.cpp(140,31): warning C4244: '=': conversion from 'ULONGLONG' to 'long', possible loss of data -D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\damage_display\damage_display_client.cpp(264,59): warning C4244: 'argument': conversion from 'float' to 'int', possible loss of data - item_drop_message_client.cpp - item_move_client.cpp -D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\client\modules\item_move\item_move_client.cpp(99,33): warning C4018: '<': signed/unsigned mismatch - loot_filter.cpp - loot_filter_settings.cpp - loot_filter_settings_menu.cpp - loot_filter_settings_toggle_menu.cpp - test.cpp - trader_update_client.cpp - transmute_client.cpp - autosort_server.cpp -D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\server\modules\autosort\autosort_server.cpp(363,25): warning C4018: '<=': signed/unsigned mismatch -D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\server\modules\autosort\autosort_server.cpp(364,26): warning C4018: '<=': signed/unsigned mismatch - auto_gold_pickup_server.cpp -D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\server\modules\auto_gold_pickup\auto_gold_pickup_server.cpp(49,33): warning C4018: '>': signed/unsigned mismatch - auto_item_pickup_server.cpp - damage_display_server.cpp - identify_on_pickup_server.cpp - item_drop_message_server.cpp - item_move_server.cpp -D:\VSCode\d2tweaks-rnd2k\src\d2tweaks\server\modules\item_move\item_move_server.cpp(144,1): warning C4715: 'd2_tweaks::server::modules::item_move::handle_packet': not all control paths return a value - test.cpp - trader_update_server.cpp - transmute_server.cpp - ui_manager.cpp - d2common.cpp - screen.cpp - LINK : ..\..\Diablo II\MODS\ironman-dev\D2tweaks.dll not found or not built by the last incremental link; performing full link + loot_filter_settings_toggle_menu.cpp D2tweaks.vcxproj -> D:\Diablo II\MODS\ironman-dev\D2tweaks.dll diff --git a/build/Debug/D2tweaks.pdb b/build/Debug/D2tweaks.pdb deleted file mode 100644 index 30b1f7e..0000000 Binary files a/build/Debug/D2tweaks.pdb and /dev/null differ diff --git a/build/Debug/D2tweaks.tlog/CL.command.1.tlog b/build/Debug/D2tweaks.tlog/CL.command.1.tlog index f04a14a..0e81ac0 100644 Binary files a/build/Debug/D2tweaks.tlog/CL.command.1.tlog and b/build/Debug/D2tweaks.tlog/CL.command.1.tlog differ diff --git a/build/Debug/D2tweaks.tlog/CL.read.1.tlog b/build/Debug/D2tweaks.tlog/CL.read.1.tlog index 02dad55..b7fe902 100644 Binary files a/build/Debug/D2tweaks.tlog/CL.read.1.tlog and b/build/Debug/D2tweaks.tlog/CL.read.1.tlog differ diff --git a/build/Debug/D2tweaks.tlog/CL.write.1.tlog b/build/Debug/D2tweaks.tlog/CL.write.1.tlog index ae5c41f..8678312 100644 Binary files a/build/Debug/D2tweaks.tlog/CL.write.1.tlog and b/build/Debug/D2tweaks.tlog/CL.write.1.tlog differ diff --git a/build/Debug/D2tweaks.tlog/link.command.1.tlog b/build/Debug/D2tweaks.tlog/link.command.1.tlog index 1cc7a4f..050b14b 100644 Binary files a/build/Debug/D2tweaks.tlog/link.command.1.tlog and b/build/Debug/D2tweaks.tlog/link.command.1.tlog differ diff --git a/build/Debug/D2tweaks.tlog/link.read.1.tlog b/build/Debug/D2tweaks.tlog/link.read.1.tlog index 8f2dc7a..3cd0a7f 100644 Binary files a/build/Debug/D2tweaks.tlog/link.read.1.tlog and b/build/Debug/D2tweaks.tlog/link.read.1.tlog differ diff --git a/build/Debug/D2tweaks.vcxproj.FileListAbsolute.txt b/build/Debug/D2tweaks.vcxproj.FileListAbsolute.txt index ad39c93..b6614f7 100644 --- a/build/Debug/D2tweaks.vcxproj.FileListAbsolute.txt +++ b/build/Debug/D2tweaks.vcxproj.FileListAbsolute.txt @@ -1,2 +1 @@ D:\VSCode\D2tweaks_src_17.04.2024\Build\Debug\D2tweaks.dll -D:\VSCode\d2tweaks-rnd2k\Build\Debug\D2tweaks.dll diff --git a/build/Debug/src/common/asm_code.obj b/build/Debug/src/common/asm_code.obj index eeb70ce..3b1f6b0 100644 Binary files a/build/Debug/src/common/asm_code.obj and b/build/Debug/src/common/asm_code.obj differ diff --git a/build/Debug/src/common/config.obj b/build/Debug/src/common/config.obj index ee81ccc..56dcb1d 100644 Binary files a/build/Debug/src/common/config.obj and b/build/Debug/src/common/config.obj differ diff --git a/build/Debug/src/common/hooking.obj b/build/Debug/src/common/hooking.obj index 730550d..e126eb3 100644 Binary files a/build/Debug/src/common/hooking.obj and b/build/Debug/src/common/hooking.obj differ diff --git a/build/Debug/src/common/ini.obj b/build/Debug/src/common/ini.obj index d300f2b..6675b27 100644 Binary files a/build/Debug/src/common/ini.obj and b/build/Debug/src/common/ini.obj differ diff --git a/build/Debug/src/common/string_utils.obj b/build/Debug/src/common/string_utils.obj index 38c7a9d..dcf0aa6 100644 Binary files a/build/Debug/src/common/string_utils.obj and b/build/Debug/src/common/string_utils.obj differ diff --git a/build/Debug/src/d2tweaks/client/client.obj b/build/Debug/src/d2tweaks/client/client.obj index 42281cc..1df8baf 100644 Binary files a/build/Debug/src/d2tweaks/client/client.obj and b/build/Debug/src/d2tweaks/client/client.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/auto_gold_pickup/auto_gold_pickup_client.obj b/build/Debug/src/d2tweaks/client/modules/auto_gold_pickup/auto_gold_pickup_client.obj index 6682a87..62dd976 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/auto_gold_pickup/auto_gold_pickup_client.obj and b/build/Debug/src/d2tweaks/client/modules/auto_gold_pickup/auto_gold_pickup_client.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/auto_item_pickup/auto_item_pickup_client.obj b/build/Debug/src/d2tweaks/client/modules/auto_item_pickup/auto_item_pickup_client.obj index b5feb6c..9bd776f 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/auto_item_pickup/auto_item_pickup_client.obj and b/build/Debug/src/d2tweaks/client/modules/auto_item_pickup/auto_item_pickup_client.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/autosort/autosort_client.obj b/build/Debug/src/d2tweaks/client/modules/autosort/autosort_client.obj index 5d65b6f..3e5d57d 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/autosort/autosort_client.obj and b/build/Debug/src/d2tweaks/client/modules/autosort/autosort_client.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/client_module.obj b/build/Debug/src/d2tweaks/client/modules/client_module.obj index 200268f..ef0951f 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/client_module.obj and b/build/Debug/src/d2tweaks/client/modules/client_module.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/damage_display/damage_display_client.obj b/build/Debug/src/d2tweaks/client/modules/damage_display/damage_display_client.obj index 2c40e7d..70dd4a8 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/damage_display/damage_display_client.obj and b/build/Debug/src/d2tweaks/client/modules/damage_display/damage_display_client.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/item_drop_message/item_drop_message_client.obj b/build/Debug/src/d2tweaks/client/modules/item_drop_message/item_drop_message_client.obj index f892d1d..ac8e1ab 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/item_drop_message/item_drop_message_client.obj and b/build/Debug/src/d2tweaks/client/modules/item_drop_message/item_drop_message_client.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/item_move/item_move_client.obj b/build/Debug/src/d2tweaks/client/modules/item_move/item_move_client.obj index b471571..368ddea 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/item_move/item_move_client.obj and b/build/Debug/src/d2tweaks/client/modules/item_move/item_move_client.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter.obj b/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter.obj index dc443a7..1d03e04 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter.obj and b/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings.obj b/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings.obj index 9b86dd8..067305b 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings.obj and b/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.obj b/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.obj index bbf1281..2d70851 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.obj and b/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_menu.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.obj b/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.obj index 9363ac6..9d5d978 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.obj and b/build/Debug/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/small_patches/small_patches.obj b/build/Debug/src/d2tweaks/client/modules/small_patches/small_patches.obj index edc434c..110ece7 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/small_patches/small_patches.obj and b/build/Debug/src/d2tweaks/client/modules/small_patches/small_patches.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/test/test.obj b/build/Debug/src/d2tweaks/client/modules/test/test.obj index 7058ad7..8cf0f38 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/test/test.obj and b/build/Debug/src/d2tweaks/client/modules/test/test.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/trader_update/trader_update_client.obj b/build/Debug/src/d2tweaks/client/modules/trader_update/trader_update_client.obj index f0eb104..3b32bed 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/trader_update/trader_update_client.obj and b/build/Debug/src/d2tweaks/client/modules/trader_update/trader_update_client.obj differ diff --git a/build/Debug/src/d2tweaks/client/modules/transmute/transmute_client.obj b/build/Debug/src/d2tweaks/client/modules/transmute/transmute_client.obj index 014ee45..7b1aa99 100644 Binary files a/build/Debug/src/d2tweaks/client/modules/transmute/transmute_client.obj and b/build/Debug/src/d2tweaks/client/modules/transmute/transmute_client.obj differ diff --git a/build/Debug/src/d2tweaks/common/asset_manager.obj b/build/Debug/src/d2tweaks/common/asset_manager.obj index a0114f3..bf4d8a1 100644 Binary files a/build/Debug/src/d2tweaks/common/asset_manager.obj and b/build/Debug/src/d2tweaks/common/asset_manager.obj differ diff --git a/build/Debug/src/d2tweaks/common/common.obj b/build/Debug/src/d2tweaks/common/common.obj index 6a209da..d30411b 100644 Binary files a/build/Debug/src/d2tweaks/common/common.obj and b/build/Debug/src/d2tweaks/common/common.obj differ diff --git a/build/Debug/src/d2tweaks/server/modules/auto_gold_pickup/auto_gold_pickup_server.obj b/build/Debug/src/d2tweaks/server/modules/auto_gold_pickup/auto_gold_pickup_server.obj index 63f431f..b60f63b 100644 Binary files a/build/Debug/src/d2tweaks/server/modules/auto_gold_pickup/auto_gold_pickup_server.obj and b/build/Debug/src/d2tweaks/server/modules/auto_gold_pickup/auto_gold_pickup_server.obj differ diff --git a/build/Debug/src/d2tweaks/server/modules/auto_item_pickup/auto_item_pickup_server.obj b/build/Debug/src/d2tweaks/server/modules/auto_item_pickup/auto_item_pickup_server.obj index b4fc372..86b9b47 100644 Binary files a/build/Debug/src/d2tweaks/server/modules/auto_item_pickup/auto_item_pickup_server.obj and b/build/Debug/src/d2tweaks/server/modules/auto_item_pickup/auto_item_pickup_server.obj differ diff --git a/build/Debug/src/d2tweaks/server/modules/autosort/autosort_server.obj b/build/Debug/src/d2tweaks/server/modules/autosort/autosort_server.obj index 8f27d5e..d0efffc 100644 Binary files a/build/Debug/src/d2tweaks/server/modules/autosort/autosort_server.obj and b/build/Debug/src/d2tweaks/server/modules/autosort/autosort_server.obj differ diff --git a/build/Debug/src/d2tweaks/server/modules/damage_display/damage_display_server.obj b/build/Debug/src/d2tweaks/server/modules/damage_display/damage_display_server.obj index 0c3d453..b02ee6a 100644 Binary files a/build/Debug/src/d2tweaks/server/modules/damage_display/damage_display_server.obj and b/build/Debug/src/d2tweaks/server/modules/damage_display/damage_display_server.obj differ diff --git a/build/Debug/src/d2tweaks/server/modules/identify_on_pickup/identify_on_pickup_server.obj b/build/Debug/src/d2tweaks/server/modules/identify_on_pickup/identify_on_pickup_server.obj index d6d11a9..baf96ec 100644 Binary files a/build/Debug/src/d2tweaks/server/modules/identify_on_pickup/identify_on_pickup_server.obj and b/build/Debug/src/d2tweaks/server/modules/identify_on_pickup/identify_on_pickup_server.obj differ diff --git a/build/Debug/src/d2tweaks/server/modules/item_drop_message/item_drop_message_server.obj b/build/Debug/src/d2tweaks/server/modules/item_drop_message/item_drop_message_server.obj index dffea63..f0b3d92 100644 Binary files a/build/Debug/src/d2tweaks/server/modules/item_drop_message/item_drop_message_server.obj and b/build/Debug/src/d2tweaks/server/modules/item_drop_message/item_drop_message_server.obj differ diff --git a/build/Debug/src/d2tweaks/server/modules/item_move/item_move_server.obj b/build/Debug/src/d2tweaks/server/modules/item_move/item_move_server.obj index a0d1c3f..44341f2 100644 Binary files a/build/Debug/src/d2tweaks/server/modules/item_move/item_move_server.obj and b/build/Debug/src/d2tweaks/server/modules/item_move/item_move_server.obj differ diff --git a/build/Debug/src/d2tweaks/server/modules/server_module.obj b/build/Debug/src/d2tweaks/server/modules/server_module.obj index e312798..a47cff0 100644 Binary files a/build/Debug/src/d2tweaks/server/modules/server_module.obj and b/build/Debug/src/d2tweaks/server/modules/server_module.obj differ diff --git a/build/Debug/src/d2tweaks/server/modules/test/test.obj b/build/Debug/src/d2tweaks/server/modules/test/test.obj index f526adc..5c83c6c 100644 Binary files a/build/Debug/src/d2tweaks/server/modules/test/test.obj and b/build/Debug/src/d2tweaks/server/modules/test/test.obj differ diff --git a/build/Debug/src/d2tweaks/server/modules/trader_update/trader_update_server.obj b/build/Debug/src/d2tweaks/server/modules/trader_update/trader_update_server.obj index a6c62a6..b7d0952 100644 Binary files a/build/Debug/src/d2tweaks/server/modules/trader_update/trader_update_server.obj and b/build/Debug/src/d2tweaks/server/modules/trader_update/trader_update_server.obj differ diff --git a/build/Debug/src/d2tweaks/server/modules/transmute/transmute_server.obj b/build/Debug/src/d2tweaks/server/modules/transmute/transmute_server.obj index f98a430..2b9ff21 100644 Binary files a/build/Debug/src/d2tweaks/server/modules/transmute/transmute_server.obj and b/build/Debug/src/d2tweaks/server/modules/transmute/transmute_server.obj differ diff --git a/build/Debug/src/d2tweaks/server/server.obj b/build/Debug/src/d2tweaks/server/server.obj index 9d31ce4..91b5a07 100644 Binary files a/build/Debug/src/d2tweaks/server/server.obj and b/build/Debug/src/d2tweaks/server/server.obj differ diff --git a/build/Debug/src/d2tweaks/ui/controls/button.obj b/build/Debug/src/d2tweaks/ui/controls/button.obj index 70d7f42..8d7172e 100644 Binary files a/build/Debug/src/d2tweaks/ui/controls/button.obj and b/build/Debug/src/d2tweaks/ui/controls/button.obj differ diff --git a/build/Debug/src/d2tweaks/ui/controls/checkbox.obj b/build/Debug/src/d2tweaks/ui/controls/checkbox.obj index 0bb928d..7476e78 100644 Binary files a/build/Debug/src/d2tweaks/ui/controls/checkbox.obj and b/build/Debug/src/d2tweaks/ui/controls/checkbox.obj differ diff --git a/build/Debug/src/d2tweaks/ui/controls/group.obj b/build/Debug/src/d2tweaks/ui/controls/group.obj index b85e3df..d3d58bc 100644 Binary files a/build/Debug/src/d2tweaks/ui/controls/group.obj and b/build/Debug/src/d2tweaks/ui/controls/group.obj differ diff --git a/build/Debug/src/d2tweaks/ui/controls/image.obj b/build/Debug/src/d2tweaks/ui/controls/image.obj index 0fcee8d..a8bde9a 100644 Binary files a/build/Debug/src/d2tweaks/ui/controls/image.obj and b/build/Debug/src/d2tweaks/ui/controls/image.obj differ diff --git a/build/Debug/src/d2tweaks/ui/controls/label.obj b/build/Debug/src/d2tweaks/ui/controls/label.obj index e7dc75c..fff37c2 100644 Binary files a/build/Debug/src/d2tweaks/ui/controls/label.obj and b/build/Debug/src/d2tweaks/ui/controls/label.obj differ diff --git a/build/Debug/src/d2tweaks/ui/menu.obj b/build/Debug/src/d2tweaks/ui/menu.obj index 1233858..1532fa2 100644 Binary files a/build/Debug/src/d2tweaks/ui/menu.obj and b/build/Debug/src/d2tweaks/ui/menu.obj differ diff --git a/build/Debug/src/d2tweaks/ui/ui_manager.obj b/build/Debug/src/d2tweaks/ui/ui_manager.obj index 23322a0..ec86545 100644 Binary files a/build/Debug/src/d2tweaks/ui/ui_manager.obj and b/build/Debug/src/d2tweaks/ui/ui_manager.obj differ diff --git a/build/Debug/src/diablo2/d2client.obj b/build/Debug/src/diablo2/d2client.obj index ffb3e67..6d063b5 100644 Binary files a/build/Debug/src/diablo2/d2client.obj and b/build/Debug/src/diablo2/d2client.obj differ diff --git a/build/Debug/src/diablo2/d2cmp.obj b/build/Debug/src/diablo2/d2cmp.obj index d1fac89..75a18ae 100644 Binary files a/build/Debug/src/diablo2/d2cmp.obj and b/build/Debug/src/diablo2/d2cmp.obj differ diff --git a/build/Debug/src/diablo2/d2common.obj b/build/Debug/src/diablo2/d2common.obj index 3702f57..dc0a4bb 100644 Binary files a/build/Debug/src/diablo2/d2common.obj and b/build/Debug/src/diablo2/d2common.obj differ diff --git a/build/Debug/src/diablo2/d2game.obj b/build/Debug/src/diablo2/d2game.obj index 0d201b8..57c7483 100644 Binary files a/build/Debug/src/diablo2/d2game.obj and b/build/Debug/src/diablo2/d2game.obj differ diff --git a/build/Debug/src/diablo2/d2gfx.obj b/build/Debug/src/diablo2/d2gfx.obj index 56348a8..34b380d 100644 Binary files a/build/Debug/src/diablo2/d2gfx.obj and b/build/Debug/src/diablo2/d2gfx.obj differ diff --git a/build/Debug/src/diablo2/d2lang.obj b/build/Debug/src/diablo2/d2lang.obj index 170a7be..5de7b2b 100644 Binary files a/build/Debug/src/diablo2/d2lang.obj and b/build/Debug/src/diablo2/d2lang.obj differ diff --git a/build/Debug/src/diablo2/d2launch.obj b/build/Debug/src/diablo2/d2launch.obj index 6049b44..5c37e18 100644 Binary files a/build/Debug/src/diablo2/d2launch.obj and b/build/Debug/src/diablo2/d2launch.obj differ diff --git a/build/Debug/src/diablo2/d2net.obj b/build/Debug/src/diablo2/d2net.obj index 960fff9..ca7f395 100644 Binary files a/build/Debug/src/diablo2/d2net.obj and b/build/Debug/src/diablo2/d2net.obj differ diff --git a/build/Debug/src/diablo2/d2win.obj b/build/Debug/src/diablo2/d2win.obj index 55da256..f1de729 100644 Binary files a/build/Debug/src/diablo2/d2win.obj and b/build/Debug/src/diablo2/d2win.obj differ diff --git a/build/Debug/src/diablo2/fog.obj b/build/Debug/src/diablo2/fog.obj index 96c8505..e153ecb 100644 Binary files a/build/Debug/src/diablo2/fog.obj and b/build/Debug/src/diablo2/fog.obj differ diff --git a/build/Debug/src/diablo2/storm.obj b/build/Debug/src/diablo2/storm.obj index 7603dcf..dd43fac 100644 Binary files a/build/Debug/src/diablo2/storm.obj and b/build/Debug/src/diablo2/storm.obj differ diff --git a/build/Debug/src/diablo2/utils/mpq_ifstream.obj b/build/Debug/src/diablo2/utils/mpq_ifstream.obj index 76440d1..9110005 100644 Binary files a/build/Debug/src/diablo2/utils/mpq_ifstream.obj and b/build/Debug/src/diablo2/utils/mpq_ifstream.obj differ diff --git a/build/Debug/src/diablo2/utils/screen.obj b/build/Debug/src/diablo2/utils/screen.obj index b60b389..4ebabb6 100644 Binary files a/build/Debug/src/diablo2/utils/screen.obj and b/build/Debug/src/diablo2/utils/screen.obj differ diff --git a/build/Debug/src/main.obj b/build/Debug/src/main.obj index db90ef4..b8e6929 100644 Binary files a/build/Debug/src/main.obj and b/build/Debug/src/main.obj differ diff --git a/build/Debug/vc143.pdb b/build/Debug/vc143.pdb index 9afbeb1..6611021 100644 Binary files a/build/Debug/vc143.pdb and b/build/Debug/vc143.pdb differ diff --git a/build/Debug/vendor/D2Template/D2Template.obj b/build/Debug/vendor/D2Template/D2Template.obj index 95ed565..29d41f0 100644 Binary files a/build/Debug/vendor/D2Template/D2Template.obj and b/build/Debug/vendor/D2Template/D2Template.obj differ diff --git a/build/Debug/vendor/DllNotify/DllNotify.obj b/build/Debug/vendor/DllNotify/DllNotify.obj index ebbe0ac..446307a 100644 Binary files a/build/Debug/vendor/DllNotify/DllNotify.obj and b/build/Debug/vendor/DllNotify/DllNotify.obj differ diff --git a/build/Debug/vendor/minhook/src/buffer.obj b/build/Debug/vendor/minhook/src/buffer.obj index 49895b8..ff437f7 100644 Binary files a/build/Debug/vendor/minhook/src/buffer.obj and b/build/Debug/vendor/minhook/src/buffer.obj differ diff --git a/build/Debug/vendor/minhook/src/hde/hde32.obj b/build/Debug/vendor/minhook/src/hde/hde32.obj index a5b6f65..ce0833b 100644 Binary files a/build/Debug/vendor/minhook/src/hde/hde32.obj and b/build/Debug/vendor/minhook/src/hde/hde32.obj differ diff --git a/build/Debug/vendor/minhook/src/hde/hde64.obj b/build/Debug/vendor/minhook/src/hde/hde64.obj index 609606a..4c85b08 100644 Binary files a/build/Debug/vendor/minhook/src/hde/hde64.obj and b/build/Debug/vendor/minhook/src/hde/hde64.obj differ diff --git a/build/Debug/vendor/minhook/src/hook.obj b/build/Debug/vendor/minhook/src/hook.obj index 4b575ab..ea6c1e6 100644 Binary files a/build/Debug/vendor/minhook/src/hook.obj and b/build/Debug/vendor/minhook/src/hook.obj differ diff --git a/build/Debug/vendor/minhook/src/trampoline.obj b/build/Debug/vendor/minhook/src/trampoline.obj index 9a54b6b..e8f9f88 100644 Binary files a/build/Debug/vendor/minhook/src/trampoline.obj and b/build/Debug/vendor/minhook/src/trampoline.obj differ 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 d3f3e2b..7960277 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 @@ -16,7 +16,7 @@ namespace d2_tweaks { namespace modules { class loot_filter_settings_toggle_menu final : public ui::menu, singleton { ui::controls::button* m_toggle_filter_settings_btn; - + ui::controls::button* m_btn_toggle_stats; ui::controls::button* m_btn_toggle_help; ui::controls::button* m_btn_toggle_cube; ui::controls::button* m_btn_toggle_stash; @@ -27,18 +27,24 @@ namespace d2_tweaks { public: menu* m_filter_settings_menu; menu* m_menu; - bool m_show; - - ui::controls::button* m_btn_toggle_stats; + bool m_show; + bool m_show_bag; + explicit loot_filter_settings_toggle_menu(token); + void toggle_show() { + m_show = !m_show; + set_enabled(m_show); + set_visible(m_show); + } + void toggle_filter_settings_click(); void toggle_stats_settings_click(); void toggle_help_click(); void toggle_cube_click(); void toggle_stash_click(); - + void toggle_bag_click(); void draw() override; bool key_event(uint32_t key, bool up) override; 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 16ce707..206b7cf 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 @@ -158,131 +158,6 @@ void displayStat() { int y = GetPrivateProfileInt("BagStats", "y", 0, "./d2tweaks.ini"); int z = GetPrivateProfileInt("BagStats", "spacer", 0, "./d2tweaks.ini"); - //for (auto item = inventory->first_item; item != nullptr; item = item->item_data->pt_next_item) { - // const auto record = diablo2::d2_common::get_item_record(item->data_record_index); - // auto recordType = diablo2::d2_common::get_item_type_record(record->type); - // char* normCode1 = record->string_code; - // if (strncmp(normCode1, "ib1", 3) == 0) { - // bag = item; - // bagGuid = item->guid; - - // // gems - // statRuby = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Ruby, NULL); - // statAmethyst = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Amethyst, NULL); - // statDiamond = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Diamond, NULL); - // statEmerald = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Emerald, NULL); - // statSapphire = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Sapphire, NULL); - // statTopaz = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Topaz, NULL); - // statSkull = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Skull, NULL); - - // // runes - // runebag_RunesA = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesA, NULL); - // runebag_RunesB = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesB, NULL); - // runebag_RunesC = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesC, NULL); - // runebag_RunesD = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesD, NULL); - // runebag_RunesE = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesE, NULL); - // runebag_RunesF = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_runebag_RunesF, NULL); - - // // rejuv & misc potions - // gembag_Potions = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Potions, NULL); - - // // potions - // gembag_PotionsHP = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_PotionsHP, NULL); - // gembag_PotionsMana = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_PotionsMana, NULL); - - // // stones - // gembag_Stones_Flourite = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Flourite, NULL); - // gembag_Stones_Jade = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Jade, NULL); - // gembag_Stones_Argonite = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Argonite, NULL); - // gembag_Stones_Azurite = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Azurite, NULL); - // gembag_Stones_Sulpher = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Sulpher, NULL); - // gembag_Stones_Quartz = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_Quartz, NULL); - // gembag_Stones_TigerEye = diablo2::d2_common::get_stat(item, diablo2::UNIT_STAT_gembag_Stones_TigerEye, NULL); - - // diablo2::d2_win::set_current_font(diablo2::UI_FONT_16); - - // diablo2::d2_win::draw_text(const_cast((L"Chipped Rubies: ")), x, y + 15 + textOffset, diablo2::UI_COLOR_RED, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(statRuby)).c_str()), x + z, y + 15 + textOffset, diablo2::UI_COLOR_RED, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Chipped Amethyst: ")), x, y + 27 + textOffset, diablo2::UI_COLOR_PURPLE, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(statAmethyst)).c_str()), x + z, y + 27 + textOffset, diablo2::UI_COLOR_PURPLE, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Chipped Diamonds: ")), x, y + 39 + textOffset, diablo2::UI_COLOR_WHITE, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(statDiamond)).c_str()), x + z, y + 39 + textOffset, diablo2::UI_COLOR_WHITE, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Chipped Emeralds: ")), x, y + 51 + textOffset, diablo2::UI_COLOR_LIGHT_GREEN, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(statEmerald)).c_str()), x + z, y + 51 + textOffset, diablo2::UI_COLOR_LIGHT_GREEN, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Chipped Sapphires: ")), x, y + 63 + textOffset, diablo2::UI_COLOR_BLUE, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(statSapphire)).c_str()), x + z, y + 63 + textOffset, diablo2::UI_COLOR_BLUE, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Chipped Topaz: ")), x, y + 75 + textOffset, diablo2::UI_COLOR_YELLOW, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(statTopaz)).c_str()), x + z, y + 75 + textOffset, diablo2::UI_COLOR_YELLOW, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Chipped Skulls: ")), x, y + 87 + textOffset, diablo2::UI_COLOR_GREY, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(statSkull)).c_str()), x + z, y + 87 + textOffset, diablo2::UI_COLOR_GREY, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Runes 1 - 6: ")), x, y + 109 + textOffset, diablo2::UI_COLOR_GREY, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(runebag_RunesA)).c_str()), x + z, y + 109 + textOffset, diablo2::UI_COLOR_GREY, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Runes 7 - 12: ")), x, y + 121 + textOffset, diablo2::UI_COLOR_GREY, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(runebag_RunesB)).c_str()), x + z, y + 121 + textOffset, diablo2::UI_COLOR_GREY, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Runes 13 - 18: ")), x, y + 133 + textOffset, diablo2::UI_COLOR_GREY, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(runebag_RunesC)).c_str()), x + z, y + 133 + textOffset, diablo2::UI_COLOR_GREY, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Runes 19 - 24: ")), x, y + 145 + textOffset, diablo2::UI_COLOR_GREY, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(runebag_RunesD)).c_str()), x + z, y + 145 + textOffset, diablo2::UI_COLOR_GREY, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Runes 25 - 30: ")), x, y + 157 + textOffset, diablo2::UI_COLOR_GREY, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(runebag_RunesE)).c_str()), x + z, y + 157 + textOffset, diablo2::UI_COLOR_GREY, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Runes 31 - 33: ")), x, y + 169 + textOffset, diablo2::UI_COLOR_GREY, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(runebag_RunesF)).c_str()), x + z, y + 169 + textOffset, diablo2::UI_COLOR_GREY, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Rejuv ")), x, y + 191 + textOffset, diablo2::UI_COLOR_PURPLE, 0); - // diablo2::d2_win::draw_text(const_cast((L"& Misc Potions: ")), x + 48, y + 191 + textOffset, diablo2::UI_COLOR_WHITE, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(gembag_Potions)).c_str()), x + z, y + 191 + textOffset, diablo2::UI_COLOR_WHITE, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Healing Potions: ")), x, y + 213 + textOffset, diablo2::UI_COLOR_RED, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(gembag_PotionsHP)).c_str()), x + z, y + 213 + textOffset, diablo2::UI_COLOR_RED, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Mana Potions: ")), x, y + 225 + textOffset, diablo2::UI_COLOR_BLUE, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(gembag_PotionsMana)).c_str()), x + z, y + 225 + textOffset, diablo2::UI_COLOR_BLUE, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Flourite Stones: ")), x, y + 247 + textOffset, diablo2::UI_COLOR_PURPLE, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(gembag_Stones_Flourite)).c_str()), x + z, y + 247 + textOffset, diablo2::UI_COLOR_PURPLE, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Jade Stones: ")), x, y + 259 + textOffset, diablo2::UI_COLOR_LIGHT_GREEN, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(gembag_Stones_Jade)).c_str()), x + z, y + 259 + textOffset, diablo2::UI_COLOR_LIGHT_GREEN, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Argonite Stones: ")), x, y + 271 + textOffset, diablo2::UI_COLOR_RED, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(gembag_Stones_Argonite)).c_str()), x + z, y + 271 + textOffset, diablo2::UI_COLOR_RED, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Azurite Stones: ")), x, y + 283 + textOffset, diablo2::UI_COLOR_BLUE, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(gembag_Stones_Azurite)).c_str()), x + z, y + 283 + textOffset, diablo2::UI_COLOR_BLUE, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Sulpher Stones: ")), x, y + 295 + textOffset, diablo2::UI_COLOR_ORANGE, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(gembag_Stones_Sulpher)).c_str()), x + z, y + 295 + textOffset, diablo2::UI_COLOR_ORANGE, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Quartz Stones: ")), x, y + 307 + textOffset, diablo2::UI_COLOR_WHITE, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(gembag_Stones_Quartz)).c_str()), x + z, y + 307 + textOffset, diablo2::UI_COLOR_WHITE, 0); - - // diablo2::d2_win::draw_text(const_cast((L"Tiger Eye Stones: ")), x, y + 319 + textOffset, diablo2::UI_COLOR_YELLOW, 0); - // diablo2::d2_win::draw_text(const_cast((std::to_wstring(gembag_Stones_TigerEye)).c_str()), x + z, y + 319 + textOffset, diablo2::UI_COLOR_YELLOW, 0); - - // diablo2::d2_win::set_current_font(diablo2::UI_FONT_16); - - // // print a string using draw_text - // // diablo2::d2_win::draw_text(const_cast((L"Gem/Rune/Stone/Potion Extract Menu")), 10, 25, diablo2::UI_COLOR_YELLOW, 0); - - // diablo2::d2_win::set_current_font(diablo2::UI_FONT_16); - - // diablo2::d2_gfx::draw_filled_rect(0, 0, 100, 100, 113, 0); - - // } - //} - for (auto item = inventory->first_item; item != nullptr; item = item->item_data->pt_next_item) { const auto record = diablo2::d2_common::get_item_record(item->data_record_index); auto recordType = diablo2::d2_common::get_item_type_record(record->type); @@ -1379,22 +1254,12 @@ void d2_tweaks::client::modules::loot_filter_settings_menu::extract_item(bool va #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); - - toggle_menu.m_btn_toggle_stats->set_enabled(true); - toggle_menu.m_btn_toggle_stats->set_visible(true); - - - - + toggle_menu.toggle_cube_click(); } void d2_tweaks::client::modules::loot_filter_settings_menu::extract_rejuv_potion(bool value) { diff --git a/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.cpp b/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.cpp index cbf0eec..dbe73fa 100644 --- a/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.cpp +++ b/src/d2tweaks/client/modules/loot_filter/loot_filter_settings_toggle_menu.cpp @@ -140,6 +140,9 @@ void d2_tweaks::client::modules::loot_filter_settings_toggle_menu::toggle_filter m_btn_toggle_stats->set_enabled(true); m_btn_toggle_stats->set_visible(true); + + toggle_cube_click(); + } void d2_tweaks::client::modules::loot_filter_settings_toggle_menu::toggle_stats_settings_click() { @@ -270,6 +273,8 @@ bool d2_tweaks::client::modules::loot_filter_settings_toggle_menu::key_event(uin m_btn_toggle_stats->set_enabled(true); m_btn_toggle_stats->set_visible(true); + toggle_cube_click(); + return true; // Block the key stroke } @@ -281,6 +286,8 @@ bool d2_tweaks::client::modules::loot_filter_settings_toggle_menu::key_event(uin m_filter_settings_menu->set_enabled(m_show); m_filter_settings_menu->set_visible(m_show); + toggle_cube_click(); + return true; //block escape key stroke } diff --git a/src/d2tweaks/ui/ui_manager.cpp b/src/d2tweaks/ui/ui_manager.cpp index 68e9aa9..a25fa67 100644 --- a/src/d2tweaks/ui/ui_manager.cpp +++ b/src/d2tweaks/ui/ui_manager.cpp @@ -513,7 +513,6 @@ bool isStoneCode(const char* normCode) { auto D2CLIENT_StoredTickCount1 = GetTickCount(); void sendPacketAndUpdateProperty(int gemBagGuid, uint32_t iCode, int prop, int val, int item_guid, diablo2::structures::unit* gemBag) { - // get item using item guid if (250 < GetTickCount() - D2CLIENT_StoredTickCount1) { @@ -539,8 +538,6 @@ void sendPacketAndUpdateProperty(int gemBagGuid, uint32_t iCode, int prop, int v } } - - LRESULT d2_tweaks::ui::ui_manager::wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { static auto& instance = singleton::instance(); @@ -1207,7 +1204,6 @@ LRESULT d2_tweaks::ui::ui_manager::wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, diablo2::d2_common::inv_remove_item(player->inventory, g_hoverItem); } - if (strncmp(normCode, "hp1", 3) == 0) { sendPacketAndUpdateProperty(gemBagGuid, 'hp1 ', 397, 1, g_hoverItem->guid, gemBag); diablo2::d2_common::inv_remove_item(player->inventory, g_hoverItem); @@ -1299,16 +1295,48 @@ LRESULT d2_tweaks::ui::ui_manager::wnd_proc(HWND hWnd, UINT msg, WPARAM wParam, diablo2::d2_common::inv_remove_item(player->inventory, g_hoverItem); } + char currentPage; + const char* key; + // Iterate through each gem type in the gemTypes map + for (const auto& gem : gemTypes) { + // Accessing the key and value of the gemTypes map + const std::string& _key = gem.first; + key = gem.first.c_str(); + const GemType& value = gem.second; + // Check if the code of the hovered item matches the current gem type + if (strncmp(normCode, key, 3) == 0) { + // Create a D2PropertyStrc structure to represent the gem property + D2PropertyStrc itemProperty = {}; + itemProperty.nProperty = value.rowID - 3; // Adjust the property ID + itemProperty.nLayer = 0; + itemProperty.nMin = value.chippedCount; + itemProperty.nMax = value.chippedCount; + // Add the gem property to the gem bag + diablo2::d2_common::add_property(gemBag, &itemProperty, 0); + // Play the drop sound associated with the hovered item + diablo2::d2_client::play_sound(record->drop_sound, nullptr, 0, 0, 0); + // Create and send a packet to the server to move the item + static d2_tweaks::common::item_move_cs packet; + packet.item_guid = g_hoverItem->guid; + packet.item_code = key; + packet.bag_guid = gemBagGuid; + packet.updateBag = 1; + packet.prop = itemProperty.nProperty; + packet.val = itemProperty.nMin; + packet.target_page = 99; + diablo2::d2_client::send_to_server(&packet, sizeof packet); + diablo2::d2_common::inv_remove_item(player->inventory, g_hoverItem); - - - + // Clear the hovered item after processing + (*reinterpret_cast(diablo2::d2_client::get_base() + 0x1158F4)) = nullptr; + } + } if (isArmorOrWeaponCode(normCode) || record->type == 61 - 3 // jewel