From 3aace0c31abc27d670b9d31cefc0ce21e22c38fe Mon Sep 17 00:00:00 2001 From: digital-apple <115373190+digital-apple@users.noreply.github.com> Date: Sun, 27 Oct 2024 14:37:03 -0300 Subject: [PATCH 1/5] Update SmithingMenu.h --- include/RE/S/SmithingMenu.h | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/include/RE/S/SmithingMenu.h b/include/RE/S/SmithingMenu.h index f3d2783ce..03ea9fe80 100644 --- a/include/RE/S/SmithingMenu.h +++ b/include/RE/S/SmithingMenu.h @@ -4,11 +4,10 @@ #include "RE/B/BSTHashMap.h" #include "RE/C/CraftingSubMenu.h" #include "RE/I/IMessageBoxCallback.h" +#include "RE/I/InventoryEntryData.h" namespace RE { - class InventoryEntryData; - namespace CraftingSubMenus { class SmithingMenu : public CraftingSubMenu @@ -55,18 +54,18 @@ namespace RE // override (CraftingSubMenu) void Accept(CallbackProcessor* a_cbReg) override; // 01 - void Unk_02(void) override; // 02 + void UpdateItemList() override; // 02 bool ProcessUserEvent(BSFixedString* a_control) override; // 05 // members - BSTArray unk100; // 100 - BSTHashMap unk118; // 118 - constructibleObject map? - NiPointer furnitureRef; // 148 - std::uint32_t unk150; // 150 - std::int32_t unk154; // 154 - FormType smithingType; // 158 - std::uint32_t unk15C; // 15C - InventoryEntryData* unk160; // 160 + BSTArray recipes; // 100 + BSTHashMap unk118; // 118 - constructibleObject map? + NiPointer furnitureRef; // 148 + std::uint32_t currentIndex; // 150 + std::int32_t selectedIndex; // 154 - if set, currentIndex will match this value. + FormType smithingType; // 158 + std::uint32_t unk15C; // 15C + InventoryEntryData* unk160; // 160 }; static_assert(sizeof(SmithingMenu) == 0x168); } From 13416f92b4659193f18a1acb601447f8ce697674 Mon Sep 17 00:00:00 2001 From: digital-apple <115373190+digital-apple@users.noreply.github.com> Date: Sun, 27 Oct 2024 14:37:14 -0300 Subject: [PATCH 2/5] Update ConstructibleObjectMenu.h --- include/RE/C/ConstructibleObjectMenu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/RE/C/ConstructibleObjectMenu.h b/include/RE/C/ConstructibleObjectMenu.h index ab0c90fb2..abc9bdd59 100644 --- a/include/RE/C/ConstructibleObjectMenu.h +++ b/include/RE/C/ConstructibleObjectMenu.h @@ -26,7 +26,7 @@ namespace RE void Run(Message a_msg) override; // 01 // members - ConstructibleObjectMenu* menu; // 10 + ConstructibleObjectMenu* subMenu; // 10 }; static_assert(sizeof(CreationConfirmCallback) == 0x18); @@ -80,9 +80,9 @@ namespace RE void SetItemCardInfo(ItemCard* a_itemCard) override; // 07 // members - BSTArray crafts; // 100 + BSTArray recipes; // 100 BSTHashMap materialFilterFlags; // 118 - kwd's formid -> FilterFlags - std::uint32_t currentCobjIdx; // 148 + std::uint32_t currentIndex; // 148 std::uint32_t pad14C; // 14C std::uint64_t unk150; // 150 std::uint64_t unk158; // 158 From 2478b302ec35f10f2413fc7b54c7e8b2e3c858b6 Mon Sep 17 00:00:00 2001 From: digital-apple <115373190+digital-apple@users.noreply.github.com> Date: Sun, 27 Oct 2024 14:41:28 -0300 Subject: [PATCH 3/5] Update ConstructibleObjectMenu.h --- include/RE/C/ConstructibleObjectMenu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/RE/C/ConstructibleObjectMenu.h b/include/RE/C/ConstructibleObjectMenu.h index abc9bdd59..da773c4f6 100644 --- a/include/RE/C/ConstructibleObjectMenu.h +++ b/include/RE/C/ConstructibleObjectMenu.h @@ -76,7 +76,7 @@ namespace RE // override (CraftingSubMenu) void Accept(CallbackProcessor* a_cbReg) override; // 01 - void UpdateItemList() override; // 06 + void UpdateConstructibleList() override; // 06 void SetItemCardInfo(ItemCard* a_itemCard) override; // 07 // members From a03b1cc3007184ef2b93cb004e7c96309cfa2d37 Mon Sep 17 00:00:00 2001 From: digital-apple <115373190+digital-apple@users.noreply.github.com> Date: Sun, 27 Oct 2024 14:41:31 -0300 Subject: [PATCH 4/5] Update SmithingMenu.h --- include/RE/S/SmithingMenu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/RE/S/SmithingMenu.h b/include/RE/S/SmithingMenu.h index 03ea9fe80..6f14b6f8d 100644 --- a/include/RE/S/SmithingMenu.h +++ b/include/RE/S/SmithingMenu.h @@ -54,7 +54,7 @@ namespace RE // override (CraftingSubMenu) void Accept(CallbackProcessor* a_cbReg) override; // 01 - void UpdateItemList() override; // 02 + void UpdateSmithingList() override; // 02 bool ProcessUserEvent(BSFixedString* a_control) override; // 05 // members From 4d11008e0e5e0958b3a819eca4d04b9c377c0162 Mon Sep 17 00:00:00 2001 From: digital-apple <115373190+digital-apple@users.noreply.github.com> Date: Sun, 27 Oct 2024 14:44:54 -0300 Subject: [PATCH 5/5] Update CraftingSubMenu.h --- include/RE/C/CraftingSubMenu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/RE/C/CraftingSubMenu.h b/include/RE/C/CraftingSubMenu.h index f7018ba9f..75fa0e5d6 100644 --- a/include/RE/C/CraftingSubMenu.h +++ b/include/RE/C/CraftingSubMenu.h @@ -26,11 +26,11 @@ namespace RE ~CraftingSubMenu() override; // 00 // add - virtual void Unk_02(void); // 02 - { return; } + virtual void UpdateSmithingList(void); // 02 - { return; } virtual void Unk_03(void); // 03 - { return; } virtual bool HasItemPreview(); // 04 - { return 1; } virtual bool ProcessUserEvent(BSFixedString* a_control); // 05 - { return 0; } - virtual void UpdateItemList(); // 06 - { return; } + virtual void UpdateConstructibleList(); // 06 - { return; } virtual void SetItemCardInfo(ItemCard* a_itemCard); // 07 - { return; } void UpdateCraftingInfo(ActorValue a_actorValue)