On a second thought it's probably TESForm and not TESBoundObject sinc…

…e shouts are not bound objects.
powerof3 · Feb 19, 2024 · c3c9df7 · c3c9df7
1 parent baf0c8c
commit c3c9df7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/include/RE/A/AIProcess.h b/include/RE/A/AIProcess.h
@@ -136,8 +136,8 @@ namespace RE
 
 		struct EquippedObject
 		{
-			TESBoundObject* object;	// 00
-			BGSEquipSlot*   slot;	// 08
+			TESForm*		object;	// 00
+			BGSEquipSlot*	slot;	// 08
 		};
 		static_assert(sizeof(EquippedObject) == 0x10);
 
@@ -209,7 +209,7 @@ namespace RE
 		float                                           deathTime;                      // 094
 		float                                           trackedDamage;                  // 098
 		std::uint32_t                                   pad09C;                         // 09C
-		BSTArray<EquippedObject>                        equippedForms;					// 0A0
+		BSTArray<EquippedObject>                        equippedForms;                  // 0A0
 		Data0B8                                         unk0B8;                         // 0B8
 		TESForm*                                        equippedObjects[Hand::kTotal];  // 0F0
 		std::uint64_t                                   unk100;                         // 100

diff --git a/include/RE/A/Actor.h b/include/RE/A/Actor.h
@@ -528,7 +528,7 @@ namespace RE
 		const TESShout*              GetCurrentShout() const;
 		InventoryEntryData*          GetEquippedEntryData(bool a_leftHand) const;
 		TESForm*                     GetEquippedObject(bool a_leftHand) const;
-		TESBoundObject*              GetEquippedObjectInSlot(const BGSEquipSlot* slot) const;
+		TESForm*					 GetEquippedObjectInSlot(const BGSEquipSlot* slot) const;
 		float                        GetEquippedWeight();
 		std::int32_t                 GetFactionRank(TESFaction* a_faction, bool a_isPlayer);
 		std::int32_t                 GetGoldAmount(bool a_noInit = false);

diff --git a/src/RE/A/Actor.cpp b/src/RE/A/Actor.cpp
@@ -396,7 +396,7 @@ namespace RE
 		}
 	}
 
-	TESBoundObject* Actor::GetEquippedObjectInSlot(const BGSEquipSlot* slot) const
+	TESForm* Actor::GetEquippedObjectInSlot(const BGSEquipSlot* slot) const
 	{
 		if (!currentProcess) {
 			return nullptr;