Merge pull request #146 from digital-apple/dev

RE some crafting submenu stuff
powerof3 · Oct 30, 2024 · 02c8372 · 02c8372
2 parents 55c22fa + 4d11008
commit 02c8372
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git 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);
 
@@ -76,13 +76,13 @@ 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
-			BSTArray<ItemEntry>             crafts;               // 100
+			BSTArray<ItemEntry>             recipes;              // 100
 			BSTHashMap<FormID, FilterFlags> 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

diff --git 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)

diff --git 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 UpdateSmithingList() override;                        // 02
 			bool ProcessUserEvent(BSFixedString* a_control) override;  // 05
 
 			// members
-			BSTArray<SmithingItemEntry>  unk100;        // 100
-			BSTHashMap<UnkKey, UnkValue> unk118;        // 118 - constructibleObject map?
-			NiPointer<TESObjectREFR>     furnitureRef;  // 148
-			std::uint32_t                unk150;        // 150
-			std::int32_t                 unk154;        // 154
-			FormType                     smithingType;  // 158
-			std::uint32_t                unk15C;        // 15C
-			InventoryEntryData*          unk160;        // 160
+			BSTArray<SmithingItemEntry>  recipes;        // 100
+			BSTHashMap<UnkKey, UnkValue> unk118;         // 118 - constructibleObject map?
+			NiPointer<TESObjectREFR>     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);
 	}