Merge pull request #87 from Bobbyclue/CarryWeight-Functions

Add Actor::GetTotalCarryWeight and InventoryChanges::GetInventoryWeight
powerof3 · Oct 1, 2023 · 383faac · 383faac
2 parents d755bca + 2c297f6
commit 383faac
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/include/RE/A/Actor.h b/include/RE/A/Actor.h
@@ -547,6 +547,7 @@ namespace RE
 		[[nodiscard]] TESObjectARMO* GetSkin() const;
 		[[nodiscard]] TESObjectARMO* GetSkin(BGSBipedObjectForm::BipedObjectSlot a_slot, bool a_noInit = false);
 		[[nodiscard]] SOUL_LEVEL     GetSoulSize() const;
+		float                        GetTotalCarryWeight();
 		TESFaction*                  GetVendorFaction();
 		const TESFaction*            GetVendorFaction() const;
 		float                        GetVoiceRecoveryTime();

diff --git a/include/RE/I/InventoryChanges.h b/include/RE/I/InventoryChanges.h
@@ -39,6 +39,7 @@ namespace RE
 
 		void           AddEntryData(InventoryEntryData* a_entry);
 		TESObjectARMO* GetArmorInSlot(std::int32_t a_slot);
+		float          GetInventoryWeight();
 		std::uint16_t  GetNextUniqueID();
 		std::uint32_t  GetWornMask();
 		void           InitFromContainerExtra();

diff --git a/src/RE/A/Actor.cpp b/src/RE/A/Actor.cpp
@@ -559,6 +559,13 @@ namespace RE
 		return func(this);
 	}
 
+	float Actor::GetTotalCarryWeight()
+	{
+		using func_t = decltype(&Actor::GetTotalCarryWeight);
+		REL::Relocation<func_t> func{ RELOCATION_ID(36456, 37452) };
+		return func(this);
+	}
+
 	TESFaction* Actor::GetVendorFaction()
 	{
 		if (!vendorFaction) {

diff --git a/src/RE/I/InventoryChanges.cpp b/src/RE/I/InventoryChanges.cpp
@@ -34,6 +34,13 @@ namespace RE
 		return func(this, a_slot);
 	}
 
+	float InventoryChanges::GetInventoryWeight()
+	{
+		using func_t = decltype(&InventoryChanges::GetInventoryWeight);
+		REL::Relocation<func_t> func{ RELOCATION_ID(15883, 16123) };
+		return func(this);
+	}
+
 	std::uint16_t InventoryChanges::GetNextUniqueID()
 	{
 		using func_t = decltype(&InventoryChanges::GetNextUniqueID);