replace msvc::function usage with std::function

shad0wshayd3-FO4 · May 9, 2024 · 0cb3d92 · 0cb3d92
1 parent 8ae1a5f
commit 0cb3d92
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 106 deletions.
diff --git a/CommonLibF4/cmake/sourcelist.cmake b/CommonLibF4/cmake/sourcelist.cmake
@@ -340,7 +340,6 @@ set(SOURCES
 	include/RE/Scaleform/Render/Render_Types2D.h
 	include/RE/Scaleform/Render/Render_Viewport.h
 	include/RE/VTABLE_IDs.h
-	include/RE/msvc/functional.h
 	include/RE/msvc/memory.h
 	include/RE/msvc/typeinfo.h
 	include/REL/Relocation.h

diff --git a/CommonLibF4/include/RE/Bethesda/ActorValueInfo.h b/CommonLibF4/include/RE/Bethesda/ActorValueInfo.h
@@ -215,21 +215,21 @@ namespace RE
 		using DerivationFunction_t = float(const ActorValueOwner* a_actor, const ActorValueInfo& a_info);
 
 		// members
-		msvc::function<ModifiedCallback_t> modifiedCallback;        // 048
-		BSStringT<char> formEditorID;                               // 068
-		ActorValueInfo* dependentActorValues[15];                   // 078
-		msvc::function<DerivationFunction_t> derivationFunction;    // 0F0
-		const char* enumNames[10];                                  // 110
-		BGSLocalizedString abbreviation;                            // 160
-		std::int32_t oldActorValue;                                 // 168
-		stl::enumeration<ActorValue::Flags, std::int32_t> flags;    // 16C
-		stl::enumeration<ActorValue::AVType, std::int32_t> avType;  // 170
-		std::uint32_t numDependentActorValues;                      // 174
-		std::uint32_t enumCount;                                    // 178
-		std::int32_t fullCacheIndex;                                // 17C
-		std::int32_t permanentCacheIndex;                           // 180
-		float defaultValue;                                         // 184
-		std::uint32_t sortIndex;                                    // 188
+		std::function<ModifiedCallback_t> modifiedCallback;         // 048
+		BSStringT<char> formEditorID;                               // 088
+		ActorValueInfo* dependentActorValues[15];                   // 098
+		std::function<DerivationFunction_t> derivationFunction;     // 110
+		const char* enumNames[10];                                  // 150
+		BGSLocalizedString abbreviation;                            // 1A0
+		std::int32_t oldActorValue;                                 // 1A8
+		stl::enumeration<ActorValue::Flags, std::int32_t> flags;    // 1AC
+		stl::enumeration<ActorValue::AVType, std::int32_t> avType;  // 1B0
+		std::uint32_t numDependentActorValues;                      // 1B4
+		std::uint32_t enumCount;                                    // 1B8
+		std::int32_t fullCacheIndex;                                // 1BC
+		std::int32_t permanentCacheIndex;                           // 1C0
+		float defaultValue;                                         // 1C4
+		std::uint32_t sortIndex;                                    // 1C8
 	};
-	static_assert(sizeof(ActorValueInfo) == 0x190);
+	static_assert(sizeof(ActorValueInfo) == 0x1D0);
 }
diff --git a/CommonLibF4/include/RE/Bethesda/BSScript/IVirtualMachine.h b/CommonLibF4/include/RE/Bethesda/BSScript/IVirtualMachine.h
@@ -29,7 +29,7 @@
 namespace RE
 {
 	template <class F>
-	using BSTThreadScrapFunction = msvc::function<F>;
+	using BSTThreadScrapFunction = std::function<F>;
 
 	namespace BSScript
 	{
@@ -140,6 +140,13 @@ namespace RE
 				std::optional<bool> a_taskletCallable = std::nullopt,
 				bool a_isLatent = false);
 
+			template <class... Args>
+			bool DispatchStaticCall(
+				const BSFixedString& a_objName,
+				const BSFixedString& a_funcName,
+				const BSTSmartPointer<IStackCallbackFunctor>& a_callback,
+				Args... a_args);
+
 			template <class... Args>
 			bool DispatchMethodCall(
 				std::uint64_t a_objHandle,

diff --git a/CommonLibF4/include/RE/Bethesda/BSScriptUtil.h b/CommonLibF4/include/RE/Bethesda/BSScriptUtil.h
@@ -1255,48 +1255,23 @@ namespace RE::BSScript
 			(std::make_index_sequence<size>{});
 			return result;
 		}
+	}
 
-		class FunctionArgsBase
-		{
-		public:
-			FunctionArgsBase() = delete;
-			FunctionArgsBase(IVirtualMachine* a_vm) :
-				vm(a_vm)
-			{}
-
-			bool operator()(BSScrapArray<Variable>& a_args)
-			{
-				args->ReplaceArray(a_args, *vm);
+	template <class... Args>
+	bool IVirtualMachine::DispatchStaticCall(
+		const BSFixedString& a_objName,
+		const BSFixedString& a_funcName,
+		const BSTSmartPointer<IStackCallbackFunctor>& a_callback,
+		Args... a_args)
+	{
+		return DispatchStaticCall(
+			a_objName,
+			a_funcName,
+			[&](BSScrapArray<Variable>& a_out) {
+				a_out = detail::PackVariables(a_args...);
 				return true;
-			}
-
-		protected:
-			ArrayWrapper<Variable>* args;  // 00
-			IVirtualMachine* vm;           // 08
-		};
-		static_assert(sizeof(FunctionArgsBase) == 0x10);
-
-		inline BSTThreadScrapFunction<bool(BSScrapArray<Variable>&)>
-			CreateThreadScrapFunction(FunctionArgsBase& a_args)
-		{
-			using func_t = decltype(&detail::CreateThreadScrapFunction);
-			REL::Relocation<func_t> func{ REL::ID(69733) };
-			return func(a_args);
-		}
-
-		template <class... Args>
-		class FunctionArgs :
-			public FunctionArgsBase
-		{
-		public:
-			FunctionArgs() = delete;
-			FunctionArgs(IVirtualMachine* a_vm, Args... a_args) :
-				FunctionArgsBase(a_vm)
-			{
-				auto scrap = PackVariables(a_args...);
-				args = new ArrayWrapper<Variable>(scrap, *vm);
-			}
-		};
+			},
+			a_callback);
 	}
 
 	template <class... Args>
@@ -1307,12 +1282,14 @@ namespace RE::BSScript
 		const BSTSmartPointer<IStackCallbackFunctor>& a_callback,
 		Args... a_args)
 	{
-		auto args = detail::FunctionArgs{ this, a_args... };
 		return DispatchMethodCall(
 			a_objHandle,
 			a_objName,
 			a_funcName,
-			detail::CreateThreadScrapFunction(args),
+			[&](BSScrapArray<Variable>& a_out) {
+				a_out = detail::PackVariables(a_args...);
+				return true;
+			},
 			a_callback);
 	}
 }
diff --git a/CommonLibF4/include/RE/Bethesda/GameScript.h b/CommonLibF4/include/RE/Bethesda/GameScript.h
@@ -20,7 +20,7 @@
 namespace RE
 {
 	template <class F>
-	using BSTThreadScrapFunction = msvc::function<F>;
+	using BSTThreadScrapFunction = std::function<F>;
 
 	namespace BSScript
 	{

diff --git a/CommonLibF4/include/RE/msvc/functional.h b/CommonLibF4/include/RE/msvc/functional.h