fix: convert free standing relocations to functions

qudix · qudix · commit fc2ded44f58e · 2026-02-10T13:57:28.000-06:00
diff --git a/include/RE/C/CombatUtilities.h b/include/RE/C/CombatUtilities.h
@@ -43,7 +43,11 @@ namespace RE
 			return func(a_projectilePos, a_projectileVelocity, a_projectileGravity, a_targetPos, a_heading, a_trajectoryPos);
 		}
 
-		inline static REL::Relocation<float> fWorldGravity{ ID::CombatUtilities::WorldGravity };
+		inline float GetWorldGravity()
+		{
+			static REL::Relocation<float> value{ ID::CombatUtilities::WorldGravity };
+			return value.get();
+		}
 
 		inline bool IsActorUsingMelee(Actor* a_actor)
 		{
diff --git a/include/RE/I/ImageSpaceEffectFullScreenBlur.h b/include/RE/I/ImageSpaceEffectFullScreenBlur.h
@@ -22,7 +22,11 @@ namespace RE
 		virtual bool IsActive() override;                                                           // 08
 		virtual bool UpdateParams(ImageSpaceEffectParam* a_param) override;                         // 09
 
-		inline static REL::Relocation<bool*> bDisable{ ID::ImageSpaceEffectFullScreenBlur::Disable };
+		inline static bool* GetDisable()
+		{
+			static REL::Relocation<bool*> value{ ID::ImageSpaceEffectFullScreenBlur::Disable };
+			return value.get();
+		}
 
 		// members
 		ImageSpaceTexture buffer[3];  // B0
diff --git a/include/RE/I/ImageSpaceEffectGetHit.h b/include/RE/I/ImageSpaceEffectGetHit.h
@@ -22,7 +22,11 @@ namespace RE
 		virtual bool IsActive() override;                                                           // 08
 		virtual bool UpdateParams(ImageSpaceEffectParam* a_param) override;                         // 09
 
-		inline static REL::Relocation<bool*> bDisable{ ID::ImageSpaceEffectGetHit::Disable };
+		inline static bool* GetDisable()
+		{
+			static REL::Relocation<bool*> value{ ID::ImageSpaceEffectGetHit::Disable };
+			return value.get();
+		}
 
 		// members
 		float*            data;       // B0
diff --git a/include/RE/I/ImageSpaceEffectHDR.h b/include/RE/I/ImageSpaceEffectHDR.h
@@ -19,7 +19,11 @@ namespace RE
 		virtual void Shutdown() override;                                                           // 04
 		virtual bool UpdateParams(ImageSpaceEffectParam* a_param) override;                         // 09
 
-		inline static REL::Relocation<bool*> UsePipboyScreenMask{ ID::ImageSpaceEffectHDR::UsePipboyScreenMask };
+		inline static bool* GetUsePipboyScreenMask()
+		{
+			static REL::Relocation<bool*> value{ ID::ImageSpaceEffectHDR::UsePipboyScreenMask };
+			return value.get();
+		}
 	};
 	static_assert(sizeof(ImageSpaceEffectHDR) == 0xB0);
 }
diff --git a/include/RE/I/ImageSpaceEffectPipboyScreen.h b/include/RE/I/ImageSpaceEffectPipboyScreen.h
@@ -21,7 +21,11 @@ namespace RE
 		virtual void ReturnTextures() override;                                                     // 06
 		virtual bool UpdateParams(ImageSpaceEffectParam* a_param) override;                         // 09
 
-		inline static REL::Relocation<bool*> bPowerArmorPipboy{ ID::ImageSpaceEffectPipboyScreen::PowerArmorPipboy };
+		inline static bool* GetPowerArmorPipboy()
+		{
+			static REL::Relocation<bool*> value{ ID::ImageSpaceEffectPipboyScreen::PowerArmorPipboy };
+			return value.get();
+		}
 
 		// members
 		NiPointer<NiTexture> scanlineTexture;  // B0
diff --git a/include/RE/I/ImageSpaceEffectRadialBlur.h b/include/RE/I/ImageSpaceEffectRadialBlur.h
@@ -18,7 +18,11 @@ namespace RE
 		virtual bool IsActive() override;                                                           // 08
 		virtual bool UpdateParams(ImageSpaceEffectParam* a_param) override;                         // 09
 
-		inline static REL::Relocation<bool*> bDisable{ ID::ImageSpaceEffectRadialBlur::Disable };
+		inline static bool* GetDisable()
+		{
+			static REL::Relocation<bool*> value{ ID::ImageSpaceEffectRadialBlur::Disable };
+			return value.get();
+		}
 	};
 	static_assert(sizeof(ImageSpaceEffectRadialBlur) == 0xB0);
 }
diff --git a/include/RE/I/ImageSpaceEffectTemporalAA.h b/include/RE/I/ImageSpaceEffectTemporalAA.h
@@ -19,7 +19,11 @@ namespace RE
 		virtual bool IsActive() override;                                                           // 08
 		virtual bool UpdateParams(ImageSpaceEffectParam* a_param) override;                         // 09
 
-		inline static REL::Relocation<std::uint32_t*> MaskS{ ID::ImageSpaceEffectTemporalAA::MaskS };
+		inline static std::uint32_t* GetMaskS()
+		{
+			static REL::Relocation<std::uint32_t*> value{ ID::ImageSpaceEffectTemporalAA::MaskS };
+			return value.get();
+		}
 
 		// members
 		float previousInvTexSizeX;         // B0
diff --git a/include/RE/P/PowerArmor.h b/include/RE/P/PowerArmor.h
@@ -57,6 +57,10 @@ namespace RE
 			return func(a_furniture, a_force3DUpdate, a_tempItemToAdd, a_hideCore);
 		}
 
-		inline static REL::Relocation<SettingT<GameSettingCollection>*> fNewBatteryCapacity{ ID::PowerArmor::fNewBatteryCapacity };
+		[[nodiscard]] inline SettingT<GameSettingCollection>* GetNewBatteryCapacity()
+		{
+			static REL::Relocation<SettingT<GameSettingCollection>*> value{ ID::PowerArmor::fNewBatteryCapacity };
+			return value.get();
+		}
 	}
 }
diff --git a/include/RE/S/SCRIPT_FUNCTION.h b/include/RE/S/SCRIPT_FUNCTION.h
@@ -68,13 +68,17 @@ namespace RE
 		std::uint16_t                              paramCount{ 0 };                           // 22
 		SCRIPT_PARAMETER*                          parameters{ nullptr };                     // 28
 		ExecuteFunction_t*                         executeFunction{ nullptr };                // 30
-		CompileFunction_t*                         compileFunction{ CompileFunction.get() };  // 38
+		CompileFunction_t*                         compileFunction{ GetCompileFunction() };  // 38
 		ConditionFunction_t*                       conditionFunction{ nullptr };              // 40
 		bool                                       editorFilter{ false };                     // 48
 		bool                                       invalidatesCellList{ false };              // 49
 
 	private:
-		inline static REL::Relocation<CompileFunction_t*> CompileFunction{ ID::SCRIPT_FUNCTION::CompileFunction };
+		[[nodiscard]] inline static CompileFunction_t* GetCompileFunction()
+		{
+			static REL::Relocation<CompileFunction_t*> value{ ID::SCRIPT_FUNCTION::CompileFunction };
+			return value.get();
+		}
 	};
 	static_assert(sizeof(SCRIPT_FUNCTION) == 0x50);
 }
diff --git a/include/RE/W/Workshop.h b/include/RE/W/Workshop.h
@@ -374,8 +374,22 @@ namespace RE
 			return func(a_recipe, a_filter);
 		}
 
-		inline static REL::Relocation<PlacementItemData*> CurrentPlacementItemData{ ID::Workshop::CurrentPlacementItemData };
-		inline static REL::Relocation<std::uint16_t*>     CurrentRow{ ID::Workshop::CurrentRow };
-		inline static REL::Relocation<ObjectRefHandle*>   PlacementItem{ ID::Workshop::PlacementItem };
+		[[nodiscard]] inline PlacementItemData* GetCurrentPlacementItemData()
+		{
+			static REL::Relocation<PlacementItemData*> value{ ID::Workshop::CurrentPlacementItemData };
+			return value.get();
+		}
+
+		[[nodiscard]] inline std::uint16_t* GetCurrentRow()
+		{
+			static REL::Relocation<std::uint16_t*> value{ ID::Workshop::CurrentRow };
+			return value.get();
+		}
+
+		[[nodiscard]] inline ObjectRefHandle* GetPlacementItem()
+		{
+			static REL::Relocation<ObjectRefHandle*> value{ ID::Workshop::PlacementItem };
+			return value.get();
+		}
 	}
 }
diff --git a/lib/commonlib-shared b/lib/commonlib-shared
@@ -1 +1 @@
-Subproject commit 3995dac7b31d5588f7c45d4cf6d025aed331371e
+Subproject commit 69d0662bc259eb4eb80adc946791fc8c40e97758

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,11 @@ namespace RE`
`43`	`43`	`return func(a_projectilePos, a_projectileVelocity, a_projectileGravity, a_targetPos, a_heading, a_trajectoryPos);`
`44`	`44`	`}`
`45`	`45`
`46`		`- inline static REL::Relocation<float> fWorldGravity{ ID::CombatUtilities::WorldGravity };`
	`46`	`+ inline float GetWorldGravity()`
	`47`	`+ {`
	`48`	`+ static REL::Relocation<float> value{ ID::CombatUtilities::WorldGravity };`
	`49`	`+ return value.get();`
	`50`	`+ }`
`47`	`51`
`48`	`52`	`inline bool IsActorUsingMelee(Actor* a_actor)`
`49`	`53`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,10 @@ namespace RE`
`57`	`57`	`return func(a_furniture, a_force3DUpdate, a_tempItemToAdd, a_hideCore);`
`58`	`58`	`}`
`59`	`59`
`60`		`- inline static REL::Relocation<SettingT<GameSettingCollection>*> fNewBatteryCapacity{ ID::PowerArmor::fNewBatteryCapacity };`
	`60`	`+ [[nodiscard]] inline SettingT<GameSettingCollection>* GetNewBatteryCapacity()`
	`61`	`+ {`
	`62`	`+ static REL::Relocation<SettingT<GameSettingCollection>*> value{ ID::PowerArmor::fNewBatteryCapacity };`
	`63`	`+ return value.get();`
	`64`	`+ }`
`61`	`65`	`}`
`62`	`66`	`}`