feat: miscX11 (Starfield-Reverse-Engineering#287)

- The X Window System (X11, or simply X) is a windowing system for bitmap displays, common on Unix-like operating systems.
qudix · Oct 11, 2024 · a30dfef · a30dfef
1 parent a9a8957
commit a30dfef
Show file tree

Hide file tree

Showing 26 changed files with 307 additions and 148 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/B/BGSDefaultObjectManager.h b/include/RE/B/BGSDefaultObjectManager.h
@@ -419,7 +419,7 @@ namespace RE
 		[[nodiscard]] static BGSDefaultObjectManager* GetSingleton()
 		{
 			using func_t = decltype(&BGSDefaultObjectManager::GetSingleton);
-			static REL::Relocation<func_t> func{ REL::ID(82283) };
+			static REL::Relocation<func_t> func{ ID::BGSDefaultObjectManager::GetSingleton };
 			return func();
 		}
 

diff --git a/include/RE/B/BGSEntryPoint.h b/include/RE/B/BGSEntryPoint.h
@@ -267,7 +267,7 @@ namespace RE
 		inline void HandleEntryPoint(ENTRY_POINT a_entryPoint, Actor* a_perkOwner, Args... a_args)
 		{
 			using func_t = decltype(&BGSEntryPoint::HandleEntryPoint<Args...>);
-			static REL::Relocation<func_t> func{ REL::ID(110912) };
+			static REL::Relocation<func_t> func{ ID::BGSEntryPoint::HandleEntryPoint };
 			return func(a_entryPoint, a_perkOwner, a_args...);
 		}
 	}

diff --git a/include/RE/B/BGSInventoryInterface.h b/include/RE/B/BGSInventoryInterface.h
@@ -50,7 +50,7 @@ namespace RE
 
 		[[nodiscard]] static BGSInventoryInterface* GetSingleton()
 		{
-			static REL::Relocation<BGSInventoryInterface**> singleton{ ID::BGSInventoryInterface::singleton };
+			static REL::Relocation<BGSInventoryInterface**> singleton{ ID::BGSInventoryInterface::Singleton };
 			return *singleton;
 		}
 

diff --git a/include/RE/B/BGSMod.h b/include/RE/B/BGSMod.h
@@ -15,9 +15,15 @@ namespace RE
 
 namespace RE::BGSMod
 {
+	class Container
+	{
+	public:
+		SF_RTTI(BGSMod__Container);
+	};
+
 	namespace Attachment
 	{
-		class Mod :
+		class __declspec(novtable) Mod :
 			public TESForm,              // 00
 			public TESFullName,          // 30
 			public TESDescription,       // 40
@@ -39,7 +45,7 @@ namespace RE::BGSMod
 
 				struct Include
 				{
-					RE::BGSMod::Attachment::Mod*             mod;
+					BGSMod::Attachment::Mod*                 mod;
 					std::uint8_t                             level;
 					REX::EnumSet<IncludesFlag, std::uint8_t> flags;
 				};
@@ -74,7 +80,18 @@ namespace RE::BGSMod
 
 	namespace Template
 	{
-		class Items : public BaseFormComponent
+		class __declspec(novtable) Item :
+			public TESFullName,       // 00
+			public BGSMod::Container  // 10
+		{
+		public:
+			SF_RTTI_VTABLE(BGSMod__Template__Item);
+
+			~Item() override;  // 00
+		};
+
+		class __declspec(novtable) Items :
+			public BaseFormComponent  // 00
 		{
 		public:
 			SF_RTTI_VTABLE(BGSMod__Template__Items);
@@ -91,7 +108,7 @@ namespace RE::BGSMod
 			virtual void Unk_0D();  // 0D
 
 			// members
-			BSTArray<void*> unk08;  // 08
+			BSTArray<Item*> items;  // 08
 			BSFixedString   unk18;  // 18
 		};
 		static_assert(sizeof(Items) == 0x20);

diff --git a/include/RE/B/BGSSaveLoadGame.h b/include/RE/B/BGSSaveLoadGame.h
@@ -8,14 +8,14 @@ namespace RE
 		void SaveGame(void* a_unk1, void* a_unk2, const char* a_name)
 		{
 			using func_t = decltype(&BGSSaveLoadGame::SaveGame);
-			static REL::Relocation<func_t> func{ REL::ID(147515) };
+			static REL::Relocation<func_t> func{ ID::BGSSaveLoadGame::SaveGame };
 			return func(this, a_unk1, a_unk2, a_name);
 		}
 
 		bool LoadGame(const char* a_name, void* a_unk1, void* a_unk2)
 		{
 			using func_t = decltype(&BGSSaveLoadGame::LoadGame);
-			static REL::Relocation<func_t> func{ REL::ID(147564) };
+			static REL::Relocation<func_t> func{ ID::BGSSaveLoadGame::LoadGame };
 			return func(this, a_name, a_unk1, a_unk2);
 		}
 	};

diff --git a/include/RE/B/BGSSaveLoadManager.h b/include/RE/B/BGSSaveLoadManager.h
@@ -7,14 +7,14 @@ namespace RE
 	public:
 		static BGSSaveLoadManager* GetSingleton()
 		{
-			static REL::Relocation<BGSSaveLoadManager**> singleton{ REL::ID(880997) };
+			static REL::Relocation<BGSSaveLoadManager**> singleton{ ID::BGSSaveLoadManager::Singleton };
 			return *singleton;
 		}
 
 		bool DeleteSaveFile(const char* a_filename, void* a_unk1, bool a_unk2)
 		{
 			using func_t = decltype(&BGSSaveLoadManager::DeleteSaveFile);
-			static REL::Relocation<func_t> func{ REL::ID(147844) };
+			static REL::Relocation<func_t> func{ ID::BGSSaveLoadManager::DeleteSaveFile };
 			return func(this, a_filename, a_unk1, a_unk2);
 		}
 	};

diff --git a/include/RE/B/BSStringPool.h b/include/RE/B/BSStringPool.h
@@ -111,7 +111,7 @@ namespace RE
 	inline void GetEntry<wchar_t>(BSStringPool::Entry*& a_result, const wchar_t* a_string, bool a_caseSensitive)
 	{
 		using func_t = decltype(&GetEntry<wchar_t>);
-		static REL::Relocation<func_t> func{ ID::BSStringPool::GetEntry_wchar_t_ };
+		static REL::Relocation<func_t> func{ ID::BSStringPool::GetEntry_wchar_t_ };  // TODO: ID changed
 		return func(a_result, a_string, a_caseSensitive);
 	}
 }
diff --git a/include/RE/G/GameVM.h b/include/RE/G/GameVM.h
@@ -162,7 +162,7 @@ namespace RE
 
 		[[nodiscard]] static GameVM* GetSingleton()
 		{
-			static REL::Relocation<GameVM**> singleton{ ID::GameVM::singleton };
+			static REL::Relocation<GameVM**> singleton{ ID::GameVM::Singleton };
 			return *singleton;
 		}
 
@@ -174,7 +174,7 @@ namespace RE
 		static void BindEverythingToScript(BSScript::IVirtualMachine** a_vm)
 		{
 			using func_t = decltype(&BindEverythingToScript);
-			static REL::Relocation<func_t> func{ REL::ID(171438) };
+			static REL::Relocation<func_t> func{ ID::GameVM::BindEverythingToScript };
 			return func(a_vm);
 		}