Make relocations static

powerof3 · powerof3 · commit f846624cb205 · 2024-08-01T04:48:58.000+05:30
diff --git a/extern/CommonLibSSE b/extern/CommonLibSSE
@@ -1 +1 @@
-Subproject commit 98f801811235a9b14dc38968b0be04af7f39fc4c
+Subproject commit 2f9e4f922938fbfddff4c0bdcd7f9f117d6fb8df
diff --git a/src/Experimental/UpdateGameTimers.cpp b/src/Experimental/UpdateGameTimers.cpp
@@ -8,7 +8,7 @@ namespace Experimental::UpdateGameTimers
 		static void UpdateTimers(RE::PlayerCharacter* a_player)
 		{
 			using func_t = decltype(&UpdateTimers);
-			REL::Relocation<func_t> func{ REL_ID(39410, 40485) };
+			static REL::Relocation<func_t> func{ REL_ID(39410, 40485) };
 			return func(a_player);
 		}
 
diff --git a/src/Fixes/IsFurnitureAnimTypeForFurniture.cpp b/src/Fixes/IsFurnitureAnimTypeForFurniture.cpp
@@ -10,7 +10,7 @@ namespace Fixes::IsFurnitureAnimTypeForFurniture
 			static std::uint32_t GetEquippedFurnitureType(RE::Actor* a_actor)
 			{
 				using func_t = decltype(&GetEquippedFurnitureType);
-				REL::Relocation<func_t> func{ REL_ID(36720, 37732) };
+				static REL::Relocation<func_t> func{ REL_ID(36720, 37732) };
 				return func(a_actor);
 			}
 
diff --git a/src/Fixes/ToggleCollision.cpp b/src/Fixes/ToggleCollision.cpp
@@ -12,7 +12,7 @@ namespace Fixes::ToggleCollision
 			static void ToggleGlobalCollision()
 			{
 				using func_t = decltype(&ToggleGlobalCollision);
-				REL::Relocation<func_t> func{ REL_ID(13224, 13375) };
+				static REL::Relocation<func_t> func{ REL_ID(13224, 13375) };
 				return func();
 			}
 
diff --git a/src/Fixes/ToggleGlobalAI.cpp b/src/Fixes/ToggleGlobalAI.cpp
@@ -7,7 +7,7 @@ namespace Fixes::ToggleGlobalAI
 		static void ClearPath(RE::Actor* a_actor)
 		{
 			using func_t = decltype(&ClearPath);
-			REL::Relocation<func_t> func{ REL_ID(36802, 37818) };
+			static REL::Relocation<func_t> func{ REL_ID(36802, 37818) };
 			return func(a_actor);
 		}
 
diff --git a/src/Fixes/UnderwaterCamera.cpp b/src/Fixes/UnderwaterCamera.cpp
@@ -8,7 +8,7 @@ namespace Fixes::UnderWaterCamera
 		static void UpdateUnderWaterVariables(RE::TESWaterSystem* a_manager, bool a_underWater, float a_waterHeight)
 		{
 			using func_t = decltype(&UpdateUnderWaterVariables);
-			REL::Relocation<func_t> func{ REL_ID(31409, 32216) };
+			static REL::Relocation<func_t> func{ REL_ID(31409, 32216) };
 			return func(a_manager, a_underWater, a_waterHeight);
 		}
 	};
diff --git a/src/Fixes/ValidateScreenshotFolder.cpp b/src/Fixes/ValidateScreenshotFolder.cpp
@@ -9,7 +9,7 @@ namespace Fixes::ValidateScreenshotFolder
 	RE::Setting* set_ini_string(RE::Setting* a_setting, const char* a_str)
 	{
 		using func_t = decltype(&set_ini_string);
-		REL::Relocation<func_t> func{ RELOCATION_ID(73882, 75619) };
+		static REL::Relocation<func_t> func{ RELOCATION_ID(73882, 75619) };
 		return func(a_setting, a_str);
 	}
 
diff --git a/src/Fixes/WornRestrictionsForWeapons.cpp b/src/Fixes/WornRestrictionsForWeapons.cpp
@@ -18,7 +18,7 @@ namespace Fixes::WornRestrictionsForWeapons
 			auto wornRestrictionList = a_effect->data->data.wornRestrictions;
 			auto keywordForm = a_item->data->object->As<RE::BGSKeywordForm>();
 
-			if (!wornRestrictionList || !keywordForm) {
+			if (!wornRestrictionList) {
 				return true;
 			}
 
diff --git a/src/Tweaks/FactionStealing.cpp b/src/Tweaks/FactionStealing.cpp
@@ -10,7 +10,7 @@ namespace Tweaks::FactionStealing
 			static std::int32_t GetFavorCost(RE::TESNPC* a_player, RE::TESNPC* a_owner)
 			{
 				using func_t = decltype(&GetFavorCost);
-				REL::Relocation<func_t> func{ REL_ID(23626, 24078) };
+				static REL::Relocation<func_t> func{ REL_ID(23626, 24078) };
 				return func(a_player, a_owner);
 			}
 
diff --git a/src/Tweaks/GameTimeAffectsSounds.cpp b/src/Tweaks/GameTimeAffectsSounds.cpp
@@ -44,7 +44,7 @@ namespace Tweaks::GameTimeAffectsSounds
 		static void Play(RE::BSAudioManager* a_manager, std::int32_t a_soundID)
 		{
 			using func_t = decltype(&Play);
-			REL::Relocation<func_t> func{ REL_ID(66408, 67671) };
+			static REL::Relocation<func_t> func{ REL_ID(66408, 67671) };
 			return func(a_manager, a_soundID);
 		}
 	};
@@ -69,7 +69,7 @@ namespace Tweaks::GameTimeAffectsSounds
 		static void PlayAfter(RE::BSAudioManager* a_manager, std::int32_t a_soundID, std::uint32_t a_unk03)
 		{
 			using func_t = decltype(&PlayAfter);
-			REL::Relocation<func_t> func{ REL_ID(66409, 67672) };
+			static REL::Relocation<func_t> func{ REL_ID(66409, 67672) };
 			return func(a_manager, a_soundID, a_unk03);
 		}
 	};
diff --git a/src/Tweaks/SitToWait.cpp b/src/Tweaks/SitToWait.cpp
@@ -9,14 +9,14 @@ namespace Tweaks::SitToWait
 		static bool ProcessMenu(const RE::BSFixedString& a_menuName, RE::UI_MESSAGE_TYPE a_type, bool a_unk03)
 		{
 			using func_t = decltype(&ProcessMenu);
-			REL::Relocation<func_t> func{ REL_ID(80077, 82180) };
+			static REL::Relocation<func_t> func{ REL_ID(80077, 82180) };
 			return func(a_menuName, a_type, a_unk03);
 		}
 
 		static bool CanSleepWait(RE::PlayerCharacter* a_player, RE::TESObjectREFR* a_furniture)
 		{
 			using func_t = decltype(&CanSleepWait);
-			REL::Relocation<func_t> func{ REL_ID(39371, 40443) };
+			static REL::Relocation<func_t> func{ REL_ID(39371, 40443) };
 			return func(a_player, a_furniture);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Experimental::UpdateGameTimers`
`8`	`8`	`static void UpdateTimers(RE::PlayerCharacter* a_player)`
`9`	`9`	`{`
`10`	`10`	`using func_t = decltype(&UpdateTimers);`
`11`		`- REL::Relocation<func_t> func{ REL_ID(39410, 40485) };`
	`11`	`+ static REL::Relocation<func_t> func{ REL_ID(39410, 40485) };`
`12`	`12`	`return func(a_player);`
`13`	`13`	`}`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Fixes::IsFurnitureAnimTypeForFurniture`
`10`	`10`	`static std::uint32_t GetEquippedFurnitureType(RE::Actor* a_actor)`
`11`	`11`	`{`
`12`	`12`	`using func_t = decltype(&GetEquippedFurnitureType);`
`13`		`- REL::Relocation<func_t> func{ REL_ID(36720, 37732) };`
	`13`	`+ static REL::Relocation<func_t> func{ REL_ID(36720, 37732) };`
`14`	`14`	`return func(a_actor);`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace Fixes::ToggleCollision`
`12`	`12`	`static void ToggleGlobalCollision()`
`13`	`13`	`{`
`14`	`14`	`using func_t = decltype(&ToggleGlobalCollision);`
`15`		`- REL::Relocation<func_t> func{ REL_ID(13224, 13375) };`
	`15`	`+ static REL::Relocation<func_t> func{ REL_ID(13224, 13375) };`
`16`	`16`	`return func();`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Fixes::ToggleGlobalAI`
`7`	`7`	`static void ClearPath(RE::Actor* a_actor)`
`8`	`8`	`{`
`9`	`9`	`using func_t = decltype(&ClearPath);`
`10`		`- REL::Relocation<func_t> func{ REL_ID(36802, 37818) };`
	`10`	`+ static REL::Relocation<func_t> func{ REL_ID(36802, 37818) };`
`11`	`11`	`return func(a_actor);`
`12`	`12`	`}`
`13`	`13`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace Fixes::UnderWaterCamera`
`8`	`8`	`static void UpdateUnderWaterVariables(RE::TESWaterSystem* a_manager, bool a_underWater, float a_waterHeight)`
`9`	`9`	`{`
`10`	`10`	`using func_t = decltype(&UpdateUnderWaterVariables);`
`11`		`- REL::Relocation<func_t> func{ REL_ID(31409, 32216) };`
	`11`	`+ static REL::Relocation<func_t> func{ REL_ID(31409, 32216) };`
`12`	`12`	`return func(a_manager, a_underWater, a_waterHeight);`
`13`	`13`	`}`
`14`	`14`	`};`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ namespace Fixes::ValidateScreenshotFolder`
`9`	`9`	`RE::Setting* set_ini_string(RE::Setting* a_setting, const char* a_str)`
`10`	`10`	`{`
`11`	`11`	`using func_t = decltype(&set_ini_string);`
`12`		`- REL::Relocation<func_t> func{ RELOCATION_ID(73882, 75619) };`
	`12`	`+ static REL::Relocation<func_t> func{ RELOCATION_ID(73882, 75619) };`
`13`	`13`	`return func(a_setting, a_str);`
`14`	`14`	`}`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace Fixes::WornRestrictionsForWeapons`
`18`	`18`	`auto wornRestrictionList = a_effect->data->data.wornRestrictions;`
`19`	`19`	`auto keywordForm = a_item->data->object->As<RE::BGSKeywordForm>();`
`20`	`20`
`21`		`- if (!wornRestrictionList \|\| !keywordForm) {`
	`21`	`+ if (!wornRestrictionList) {`
`22`	`22`	`return true;`
`23`	`23`	`}`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace Tweaks::FactionStealing`
`10`	`10`	`static std::int32_t GetFavorCost(RE::TESNPC* a_player, RE::TESNPC* a_owner)`
`11`	`11`	`{`
`12`	`12`	`using func_t = decltype(&GetFavorCost);`
`13`		`- REL::Relocation<func_t> func{ REL_ID(23626, 24078) };`
	`13`	`+ static REL::Relocation<func_t> func{ REL_ID(23626, 24078) };`
`14`	`14`	`return func(a_player, a_owner);`
`15`	`15`	`}`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ namespace Tweaks::GameTimeAffectsSounds`
`44`	`44`	`static void Play(RE::BSAudioManager* a_manager, std::int32_t a_soundID)`
`45`	`45`	`{`
`46`	`46`	`using func_t = decltype(&Play);`
`47`		`- REL::Relocation<func_t> func{ REL_ID(66408, 67671) };`
	`47`	`+ static REL::Relocation<func_t> func{ REL_ID(66408, 67671) };`
`48`	`48`	`return func(a_manager, a_soundID);`
`49`	`49`	`}`
`50`	`50`	`};`
`@@ -69,7 +69,7 @@ namespace Tweaks::GameTimeAffectsSounds`
`69`	`69`	`static void PlayAfter(RE::BSAudioManager* a_manager, std::int32_t a_soundID, std::uint32_t a_unk03)`
`70`	`70`	`{`
`71`	`71`	`using func_t = decltype(&PlayAfter);`
`72`		`- REL::Relocation<func_t> func{ REL_ID(66409, 67672) };`
	`72`	`+ static REL::Relocation<func_t> func{ REL_ID(66409, 67672) };`
`73`	`73`	`return func(a_manager, a_soundID, a_unk03);`
`74`	`74`	`}`
`75`	`75`	`};`