Merge branch 'powerof3:dev' into dev-clang-cl

qudix · Nov 9, 2024 · 2657080 · 2657080
2 parents 25fac7a + e63d67c
commit 2657080
Show file tree

Hide file tree

Showing 97 changed files with 147 additions and 140 deletions.
diff --git a/include/RE/A/ActorValueList.h b/include/RE/A/ActorValueList.h
@@ -10,7 +10,7 @@ namespace RE
 	public:
 		[[nodiscard]] static ActorValueList* GetSingleton()
 		{
-			REL::Relocation<ActorValueList**> singleton{ RELOCATION_ID(514139, 400267) };
+			static REL::Relocation<ActorValueList**> singleton{ RELOCATION_ID(514139, 400267) };
 			return *singleton;
 		}
 

diff --git a/include/RE/A/AnimationFileManagerSingleton.h b/include/RE/A/AnimationFileManagerSingleton.h
@@ -52,7 +52,7 @@ namespace RE
 
 		[[nodiscard]] static AnimationFileManagerSingleton* GetSingleton()
 		{
-			REL::Relocation<AnimationFileManagerSingleton**> singleton{ RELOCATION_ID(520994, 407512) };
+			static REL::Relocation<AnimationFileManagerSingleton**> singleton{ RELOCATION_ID(520994, 407512) };
 			return *singleton;
 		}
 

diff --git a/include/RE/A/AnimationObjects.h b/include/RE/A/AnimationObjects.h
@@ -32,7 +32,7 @@ namespace RE
 	public:
 		[[nodiscard]] static AnimationObjects* GetSingleton()
 		{
-			REL::Relocation<AnimationObjects**> singleton{ RELOCATION_ID(514179, 400328) };
+			static REL::Relocation<AnimationObjects**> singleton{ RELOCATION_ID(514179, 400328) };
 			return *singleton;
 		}
 

diff --git a/include/RE/B/BGSAddToPlayerInventoryEvent.h b/include/RE/B/BGSAddToPlayerInventoryEvent.h
@@ -23,7 +23,7 @@ namespace RE
 	public:
 		[[nodiscard]] static std::uint32_t& GetIndex()
 		{
-			REL::Relocation<std::uint32_t*> index{ RELOCATION_ID(508412, 380074) };
+			static REL::Relocation<std::uint32_t*> index{ RELOCATION_ID(508412, 380074) };
 			return *index;
 		}
 

diff --git a/include/RE/B/BGSDecalManager.h b/include/RE/B/BGSDecalManager.h
@@ -16,7 +16,7 @@ namespace RE
 	public:
 		static BGSDecalManager* GetSingleton()
 		{
-			REL::Relocation<BGSDecalManager**> singleton{ RELOCATION_ID(514414, 400561) };
+			static REL::Relocation<BGSDecalManager**> singleton{ RELOCATION_ID(514414, 400561) };
 			return *singleton;
 		}
 

diff --git a/include/RE/B/BGSGrassManager.h b/include/RE/B/BGSGrassManager.h
@@ -14,7 +14,7 @@ namespace RE
 	public:
 		static BGSGrassManager* GetSingleton()
 		{
-			REL::Relocation<BGSGrassManager**> singleton{ RELOCATION_ID(514292, 400452) };
+			static REL::Relocation<BGSGrassManager**> singleton{ RELOCATION_ID(514292, 400452) };
 			return *singleton;
 		}
 

diff --git a/include/RE/B/BGSImpactManager.h b/include/RE/B/BGSImpactManager.h
@@ -49,7 +49,7 @@ namespace RE
 
 		static BGSImpactManager* GetSingleton()
 		{
-			REL::Relocation<BGSImpactManager**> singleton{ RELOCATION_ID(515123, 401262) };
+			static REL::Relocation<BGSImpactManager**> singleton{ RELOCATION_ID(515123, 401262) };
 			return *singleton;
 		}
 

diff --git a/include/RE/B/BGSSaveLoadGame.h b/include/RE/B/BGSSaveLoadGame.h
@@ -68,7 +68,7 @@ namespace RE
 
 		static BGSSaveLoadGame* GetSingleton()
 		{
-			REL::Relocation<BGSSaveLoadGame**> singleton{ RELOCATION_ID(516851, 403330) };
+			static REL::Relocation<BGSSaveLoadGame**> singleton{ RELOCATION_ID(516851, 403330) };
 			return *singleton;
 		}
 

diff --git a/include/RE/B/BSFaceGenManager.h b/include/RE/B/BSFaceGenManager.h
@@ -37,7 +37,7 @@ namespace RE
 	public:
 		[[nodiscard]] static BSFaceGenManager* GetSingleton()
 		{
-			REL::Relocation<BSFaceGenManager**> singleton{ RELOCATION_ID(514182, 400331) };
+			static REL::Relocation<BSFaceGenManager**> singleton{ RELOCATION_ID(514182, 400331) };
 			return *singleton;
 		}
 

diff --git a/include/RE/B/BSMusicManager.h b/include/RE/B/BSMusicManager.h
@@ -24,7 +24,7 @@ namespace RE
 
 		[[nodiscard]] static BSMusicManager* GetSingleton()
 		{
-			REL::Relocation<BSMusicManager**> singleton{ RELOCATION_ID(514738, 400896) };
+			static REL::Relocation<BSMusicManager**> singleton{ RELOCATION_ID(514738, 400896) };
 			return *singleton;
 		}
 

diff --git a/include/RE/B/BSPointerHandleManager.h b/include/RE/B/BSPointerHandleManager.h
@@ -27,7 +27,7 @@ namespace RE
 
 		[[nodiscard]] static auto GetHandleEntries()
 		{
-			REL::Relocation<Entry(*)[0x100000]> entries{ RELOCATION_ID(514478, 400622) };
+			static REL::Relocation<Entry(*)[0x100000]> entries{ RELOCATION_ID(514478, 400622) };
 			return std::span<Entry, 0x100000>{ *entries };
 		}
 	};

diff --git a/include/RE/B/BSShaderManager.h b/include/RE/B/BSShaderManager.h
@@ -29,7 +29,7 @@ namespace RE
 		public:
 			static BSShaderManager::State& GetSingleton()
 			{
-				REL::Relocation<BSShaderManager::State*> singleton{ RELOCATION_ID(513211, 390951) };
+				static REL::Relocation<BSShaderManager::State*> singleton{ RELOCATION_ID(513211, 390951) };
 				return *singleton;
 			}
 

diff --git a/include/RE/B/BSTimer.h b/include/RE/B/BSTimer.h
@@ -7,19 +7,19 @@ namespace RE
 	public:
 		[[nodiscard]] static BSTimer* GetSingleton() noexcept
 		{
-			REL::Relocation<BSTimer*> singleton{ RELOCATION_ID(523657, 410196) };
+			static REL::Relocation<BSTimer*> singleton{ RELOCATION_ID(523657, 410196) };
 			return singleton.get();
 		}
 
 		static float QGlobalTimeMultiplier()
 		{
-			REL::Relocation<float*> value{ RELOCATION_ID(511882, 388442) };
+			static REL::Relocation<float*> value{ RELOCATION_ID(511882, 388442) };
 			return *value;
 		}
 
 		static float QGlobalTimeMultiplierTarget()
 		{
-			REL::Relocation<float*> value{ RELOCATION_ID(511883, 388443) };
+			static REL::Relocation<float*> value{ RELOCATION_ID(511883, 388443) };
 			return *value;
 		}
 

diff --git a/include/RE/B/BSTreeManager.h b/include/RE/B/BSTreeManager.h
@@ -30,7 +30,7 @@ namespace RE
 
 		static BSTreeManager* GetSingleton()
 		{
-			REL::Relocation<BSTreeManager**> singleton{ RELOCATION_ID(514181, 400330) };
+			static REL::Relocation<BSTreeManager**> singleton{ RELOCATION_ID(514181, 400330) };
 			return *singleton;
 		}
 

diff --git a/include/RE/B/BSUtilityShader.h b/include/RE/B/BSUtilityShader.h
@@ -47,7 +47,7 @@ namespace RE
 
 		static BSUtilityShader* GetSingleton()
 		{
-			REL::Relocation<BSUtilityShader**> singleton{ RELOCATION_ID(528354, 415300) };
+			static REL::Relocation<BSUtilityShader**> singleton{ RELOCATION_ID(528354, 415300) };
 			return *singleton;
 		}
 		~BSUtilityShader() override;  // 00

diff --git a/include/RE/B/BipedAnim.h b/include/RE/B/BipedAnim.h
@@ -43,7 +43,8 @@ namespace RE
 	public:
 		~BipedAnim();
 
-		void RemoveAllParts();
+		void       RemoveAllParts();
+		BIPOBJECT* GetShieldObject();
 
 		std::uint32_t   pad0004;                                 // 0004
 		NiNode*         root;                                    // 0008

diff --git a/include/RE/B/bhkCollisionFilter.h b/include/RE/B/bhkCollisionFilter.h
@@ -14,7 +14,7 @@ namespace RE
 
 		[[nodiscard]] static bhkCollisionFilter* GetSingleton()
 		{
-			REL::Relocation<bhkCollisionFilter**> singleton{ RELOCATION_ID(514415, 400562) };
+			static REL::Relocation<bhkCollisionFilter**> singleton{ RELOCATION_ID(514415, 400562) };
 			return *singleton;
 		}
 

diff --git a/include/RE/B/bhkTelekinesisListener.h b/include/RE/B/bhkTelekinesisListener.h
@@ -20,7 +20,7 @@ namespace RE
 
 		static bhkTelekinesisListener* GetSingleton()
 		{
-			REL::Relocation<bhkTelekinesisListener**> singleton{ RELOCATION_ID(515445, 401584) };
+			static REL::Relocation<bhkTelekinesisListener**> singleton{ RELOCATION_ID(515445, 401584) };
 			return *singleton;
 		}
 	};

diff --git a/include/RE/B/bhkWorld.h b/include/RE/B/bhkWorld.h
@@ -41,13 +41,13 @@ namespace RE
 
 		static float GetWorldScale()
 		{
-			REL::Relocation<float*> worldScale{ RELOCATION_ID(231896, 188105) };
+			static REL::Relocation<float*> worldScale{ RELOCATION_ID(231896, 188105) };
 			return *worldScale;
 		}
 
 		static float GetWorldScaleInverse()
 		{
-			REL::Relocation<float*> worldScaleInverse{ RELOCATION_ID(230692, 187407) };
+			static REL::Relocation<float*> worldScaleInverse{ RELOCATION_ID(230692, 187407) };
 			return *worldScaleInverse;
 		}
 

diff --git a/include/RE/C/CombatManager.h b/include/RE/C/CombatManager.h
@@ -26,7 +26,7 @@ namespace RE
 	public:
 		[[nodiscard]] static CombatManager* GetSingleton()
 		{
-			REL::Relocation<CombatManager**> singleton{ RELOCATION_ID(518706, 405246) };
+			static REL::Relocation<CombatManager**> singleton{ RELOCATION_ID(518706, 405246) };
 			return *singleton;
 		}
 

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/C/CrosshairPickData.h b/include/RE/C/CrosshairPickData.h
@@ -14,7 +14,7 @@ namespace RE
 	public:
 		static CrosshairPickData* GetSingleton()
 		{
-			REL::Relocation<CrosshairPickData**> singleton{ RELOCATION_ID(515446, 401585) };
+			static REL::Relocation<CrosshairPickData**> singleton{ RELOCATION_ID(515446, 401585) };
 			return *singleton;
 		}
 

diff --git a/include/RE/F/FOCollisionListener.h b/include/RE/F/FOCollisionListener.h
@@ -36,7 +36,7 @@ namespace RE
 
 		static FOCollisionListener* GetSingleton()
 		{
-			REL::Relocation<FOCollisionListener**> singleton{ RELOCATION_ID(514284, 400444) };
+			static REL::Relocation<FOCollisionListener**> singleton{ RELOCATION_ID(514284, 400444) };
 			return *singleton;
 		}
 

diff --git a/include/RE/F/FORM_ENUM_STRING.h b/include/RE/F/FORM_ENUM_STRING.h
@@ -9,7 +9,7 @@ namespace RE
 	public:
 		[[nodiscard]] static std::span<FORM_ENUM_STRING, 138> GetFormEnumString()
 		{
-			REL::Relocation<FORM_ENUM_STRING(*)[138]> formEnumString{ RELOCATION_ID(501008, 359120) };
+			static REL::Relocation<FORM_ENUM_STRING(*)[138]> formEnumString{ RELOCATION_ID(501008, 359120) };
 			return { *formEnumString };
 		}
 

diff --git a/include/RE/G/GarbageCollector.h b/include/RE/G/GarbageCollector.h
@@ -52,7 +52,7 @@ namespace RE
 
 		static GarbageCollector* GetSingleton()
 		{
-			REL::Relocation<GarbageCollector**> singleton{ RELOCATION_ID(514180, 400329) };
+			static REL::Relocation<GarbageCollector**> singleton{ RELOCATION_ID(514180, 400329) };
 			return *singleton;
 		}
 

diff --git a/include/RE/H/hkContainerAllocators.h b/include/RE/H/hkContainerAllocators.h
@@ -24,7 +24,7 @@ namespace RE
 
 		[[nodiscard]] static Allocator* GetSingleton()
 		{
-			REL::Relocation<hkContainerHeapAllocator::Allocator*> singleton{ RELOCATION_ID(510713, 383828) };
+			static REL::Relocation<hkContainerHeapAllocator::Allocator*> singleton{ RELOCATION_ID(510713, 383828) };
 			return singleton.get();
 		}
 	};

diff --git a/include/RE/I/ImageSpaceManager.h b/include/RE/I/ImageSpaceManager.h
@@ -179,7 +179,7 @@ namespace RE
 
 		static ImageSpaceManager* GetSingleton()
 		{
-			REL::Relocation<ImageSpaceManager**> singleton{ RELOCATION_ID(527731, 414660) };
+			static REL::Relocation<ImageSpaceManager**> singleton{ RELOCATION_ID(527731, 414660) };
 			return *singleton;
 		}
 

diff --git a/include/RE/M/MenuTopicManager.h b/include/RE/M/MenuTopicManager.h
@@ -61,7 +61,7 @@ namespace RE
 
 		static MenuTopicManager* GetSingleton()
 		{
-			REL::Relocation<MenuTopicManager**> singleton{ RELOCATION_ID(514959, 401099) };
+			static REL::Relocation<MenuTopicManager**> singleton{ RELOCATION_ID(514959, 401099) };
 			return *singleton;
 		}
 

diff --git a/include/RE/M/MistMenu.h b/include/RE/M/MistMenu.h
@@ -60,7 +60,7 @@ namespace RE
 
 		static MistMenu* GetSingleton()
 		{
-			REL::Relocation<MistMenu**> singleton{ RELOCATION_ID(519827, 406370) };
+			static REL::Relocation<MistMenu**> singleton{ RELOCATION_ID(519827, 406370) };
 			return *singleton;
 		}
 

diff --git a/include/RE/N/NiRTTI.h b/include/RE/N/NiRTTI.h
@@ -100,7 +100,7 @@ To netimmerse_cast(const From* a_from)
 		return nullptr;
 	}
 
-	REL::Relocation<const RE::NiRTTI*> to{ RE::Ni_Impl::remove_cvpr_t<To>::Ni_RTTI };
+	static REL::Relocation<const RE::NiRTTI*> to{ RE::Ni_Impl::remove_cvpr_t<To>::Ni_RTTI };
 
 	const RE::NiRTTI* toRTTI = to.get();
 	const RE::NiRTTI* fromRTTI = a_from->GetRTTI();

diff --git a/include/RE/P/Precipitation.h b/include/RE/P/Precipitation.h
@@ -35,7 +35,7 @@ namespace RE
 
 		static NiPoint3 GetDirection()
 		{
-			REL::Relocation<NiPoint3*> precipDirection{ RELOCATION_ID(515509, 401648) };
+			static REL::Relocation<NiPoint3*> precipDirection{ RELOCATION_ID(515509, 401648) };
 			return *precipDirection;
 		}
 

diff --git a/include/RE/R/RenderTargetManager.h b/include/RE/R/RenderTargetManager.h
@@ -12,7 +12,7 @@ namespace RE
 		public:
 			[[nodiscard]] static RenderTargetManager* GetSingleton()
 			{
-				REL::Relocation<RenderTargetManager**> singleton{ RELOCATION_ID(524970, 411451) };
+				static REL::Relocation<RenderTargetManager**> singleton{ RELOCATION_ID(524970, 411451) };
 				return *singleton;
 			}
 

diff --git a/include/RE/R/ReticuleController.h b/include/RE/R/ReticuleController.h
@@ -10,7 +10,7 @@ namespace RE
 	public:
 		static ReticuleController& GetSingleton()
 		{
-			REL::Relocation<ReticuleController*> singleton{ RELOCATION_ID(508607, 380335) };
+			static REL::Relocation<ReticuleController*> singleton{ RELOCATION_ID(508607, 380335) };
 			return *singleton;
 		}
 

diff --git a/include/RE/RTTI.h b/include/RE/RTTI.h
@@ -225,8 +225,8 @@ template <
 		int> = 0>
 To skyrim_cast(From* a_from)
 {
-	REL::Relocation<void*> from{ RE::detail::remove_cvpr_t<From>::RTTI };
-	REL::Relocation<void*> to{ RE::detail::remove_cvpr_t<To>::RTTI };
+	static REL::Relocation<void*> from{ RE::detail::remove_cvpr_t<From>::RTTI };
+	static REL::Relocation<void*> to{ RE::detail::remove_cvpr_t<To>::RTTI };
 	return static_cast<To>(
 		RE::RTDynamicCast(
 			const_cast<void*>(

diff --git a/include/RE/S/ScreenSplatter.h b/include/RE/S/ScreenSplatter.h
@@ -15,7 +15,7 @@ namespace RE
 	public:
 		static ScreenSplatter* GetSingleton()
 		{
-			REL::Relocation<ScreenSplatter**> singleton{ RELOCATION_ID(514512, 400672) };
+			static REL::Relocation<ScreenSplatter**> singleton{ RELOCATION_ID(514512, 400672) };
 			return *singleton;
 		}