Removed ping build hotkey, use /pingbuild command

Refactor builds window to use pointers, move stuff to pvt namespace
gwdevhub · Jan 5, 2025 · de9940f · de9940f
1 parent a36aaad
commit de9940f
Show file tree

Hide file tree

Showing 12 changed files with 837 additions and 906 deletions.
diff --git a/Dependencies/GWCA/bin/gwca.dll b/Dependencies/GWCA/bin/gwca.dll
diff --git a/Dependencies/GWCA/include/GWCA/Managers/MemoryMgr.h b/Dependencies/GWCA/include/GWCA/Managers/MemoryMgr.h
@@ -12,7 +12,7 @@ namespace GW {
 
         DWORD GetSkillTimer();
 
-        GWCA_API bool GetPersonalDir(std::wstring& out);
+        GWCA_API bool GetPersonalDir(size_t buf_len, wchar_t* buf);
 
         GWCA_API HWND GetGWWindowHandle();
 

diff --git a/Dependencies/GWCA/include/GWCA/Managers/UIMgr.h b/Dependencies/GWCA/include/GWCA/Managers/UIMgr.h
@@ -29,7 +29,9 @@ namespace GW {
         enum Channel : int;
         typedef uint32_t Color;
     }
-
+    namespace SkillbarMgr {
+        struct SkillTemplate;
+    }
     namespace UI {
         struct TooltipInfo;
         typedef GW::Array<unsigned char> ArrayByte;
@@ -389,7 +391,7 @@ namespace GW {
 
             // GWCA Client to Server commands. Only added the ones that are used for hooks, everything else goes straight into GW
 
-            kSendLoadSkillbar           = 0x30000000 | 0x3,  // wparam = UIPacket::kSendLoadSkillbar*
+            kSendLoadSkillTemplate      = 0x30000000 | 0x3,  // wparam = SkillbarMgr::SkillTemplate*
             kSendPingWeaponSet          = 0x30000000 | 0x4,  // wparam = UIPacket::kSendPingWeaponSet*
             kSendMoveItem               = 0x30000000 | 0x5,  // wparam = UIPacket::kSendMoveItem*
             kSendMerchantRequestQuote   = 0x30000000 | 0x6,  // wparam = UIPacket::kSendMerchantRequestQuote*
@@ -418,7 +420,13 @@ namespace GW {
         enum class NumberPreference : uint32_t;
         enum class EnumPreference : uint32_t;
 
+
+
         namespace UIPacket {
+            struct kSendLoadSkillTemplate {
+                uint32_t agent_id;
+                SkillbarMgr::SkillTemplate* skill_template;
+            };
             struct kVendorWindow {
                 TransactionType transaction_type;
                 uint32_t unk;
@@ -561,10 +569,6 @@ namespace GW {
                 wchar_t* sender_enc;
             };
 
-            struct kSendLoadSkillbar {
-                uint32_t agent_id;
-                uint32_t* skill_ids;
-            };
             struct kSendPingWeaponSet {
                 uint32_t agent_id;
                 uint32_t weapon_item_id;

diff --git a/Dependencies/GWCA/lib/gwca.lib b/Dependencies/GWCA/lib/gwca.lib
diff --git a/GWToolboxdll/Utils/GuiUtils.cpp b/GWToolboxdll/Utils/GuiUtils.cpp
@@ -105,7 +105,7 @@ namespace GuiUtils {
 
     void DrawSkillbar(const char* build_code) {
         GW::SkillbarMgr::SkillTemplate skill_template;
-        if (!GW::SkillbarMgr::DecodeSkillTemplate(skill_template, build_code))
+        if (!(build_code && *build_code && GW::SkillbarMgr::DecodeSkillTemplate(skill_template, build_code)))
             return;
 
         const float text_size = ImGui::CalcTextSize(" ").y;

diff --git a/GWToolboxdll/Utils/ToolboxUtils.cpp b/GWToolboxdll/Utils/ToolboxUtils.cpp
@@ -18,6 +18,7 @@
 #include <GWCA/Managers/AgentMgr.h>
 #include <GWCA/Managers/MapMgr.h>
 #include <GWCA/Managers/SkillbarMgr.h>
+#include <GWCA/Managers/MemoryMgr.h>
 
 #include <GWCA/Packets/Opcodes.h>
 #include <GWCA/Packets/StoC.h>
@@ -164,6 +165,16 @@ namespace GW {
             return nullptr;
         }
     }
+
+    namespace MemoryMgr {
+        bool GetPersonalDir(std::wstring& out) {
+            out.resize(512, 0);
+            if (!GetPersonalDir(out.capacity(), out.data()))
+                return false;
+            out.resize(wcslen(out.data()));
+            return !out.empty();
+        }
+    }
 }
 
 namespace ToolboxUtils {

diff --git a/GWToolboxdll/Utils/ToolboxUtils.h b/GWToolboxdll/Utils/ToolboxUtils.h
@@ -122,6 +122,9 @@ namespace GW {
 
         AvailableCharacterInfo* GetAvailableCharacter(const wchar_t* name);
     }
+    namespace MemoryMgr {
+        bool GetPersonalDir(std::wstring& out);
+    }
 }
 
 namespace ToolboxUtils {