chore: move WornHasKeyword

Starfield-Reverse-Engineering · Oct 10, 2024 · 4aec77d · 4aec77d
1 parent b6c6a28
commit 4aec77d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/include/RE/A/Actor.h b/include/RE/A/Actor.h
@@ -13,7 +13,6 @@
 namespace RE
 {
 	class AIProcess;
-	class BGSKeyword;
 	class BGSPerk;
 	class CombatController;
 	class CombatGroup;
@@ -360,13 +359,6 @@ namespace RE
 			func(this);
 		}
 
-		[[nodiscard]] bool WornHasKeyword(BGSKeyword* a_keyword)
-		{
-			using func_t = decltype(&Actor::WornHasKeyword);
-			static REL::Relocation<func_t> func{ ID::Actor::WornHasKeyword };
-			return func(this, a_keyword);
-		}
-
 		// members
 		REX::EnumSet<BOOL_BITS, std::uint32_t>           boolBits;                 // 200
 		float                                            unk204;                   // 204

diff --git a/include/RE/IDs.h b/include/RE/IDs.h
@@ -12,7 +12,6 @@ namespace RE::ID
 		inline constexpr REL::ID SetSkinTone{ 146270 };
 		inline constexpr REL::ID UpdateAppearance{ 151216 };
 		inline constexpr REL::ID UpdateChargenAppearance{ 146273 };
-		inline constexpr REL::ID WornHasKeyword{ 106992 };
 	}
 
 	namespace ActorUtils
@@ -484,6 +483,7 @@ namespace RE::ID
 		inline constexpr REL::ID IsObjectEquipped{ 106991 };
 		inline constexpr REL::ID IsSpaceshipDocked{ 174146 };
 		inline constexpr REL::ID IsSpaceshipLanded{ 173880 };
+		inline constexpr REL::ID WornHasKeyword{ 106992 };
 	}
 
 	namespace TESQuest

diff --git a/include/RE/T/TESObjectREFR.h b/include/RE/T/TESObjectREFR.h
@@ -26,6 +26,7 @@ namespace RE
 	class Actor;
 	class ActorCause;
 	class BGSEquipSlot;
+	class BGSKeyword;
 	class BGSLocation;
 	class BGSObjectInstance;
 	class BGSScene;
@@ -392,6 +393,7 @@ namespace RE
 		[[nodiscard]] bool                            IsSpaceshipLanded();
 		void                                          Lock();
 		void                                          Unlock();
+		[[nodiscard]] bool                            WornHasKeyword(BGSKeyword* a_keyword);
 
 		// members
 		OBJ_REFR                                      data;           // 78

diff --git a/src/RE/T/TESObjectREFR.cpp b/src/RE/T/TESObjectREFR.cpp
@@ -159,6 +159,13 @@ namespace RE
 		return func(this);
 	}
 
+	bool TESObjectREFR::WornHasKeyword(BGSKeyword* a_keyword)
+	{
+		using func_t = decltype(&TESObjectREFR::WornHasKeyword);
+		static REL::Relocation<func_t> func{ ID::TESObjectREFR::WornHasKeyword };
+		return func(this, a_keyword);
+	}
+
 	void TESObjectREFR::Lock()
 	{
 		if (const auto lock = GetLock()) {