UnbindObject, return bool from DispatchMethodCall

shad0wshayd3-FO4 · Aug 9, 2023 · 0018889 · 0018889
1 parent 0fb8772
commit 0018889
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CommonLibF4/include/RE/Bethesda/BSScript/IVirtualMachine.h b/CommonLibF4/include/RE/Bethesda/BSScript/IVirtualMachine.h
@@ -141,7 +141,7 @@ namespace RE
 				bool a_isLatent = false);
 
 			template <class... Args>
-			void DispatchMethodCall(
+			bool DispatchMethodCall(
 				std::uint64_t a_objHandle,
 				const BSFixedString& a_objName,
 				const BSFixedString& a_funcName,

diff --git a/CommonLibF4/include/RE/Bethesda/BSScript/ObjectBindPolicy.h b/CommonLibF4/include/RE/Bethesda/BSScript/ObjectBindPolicy.h
@@ -63,6 +63,13 @@ namespace RE
 				return func(this, a_obj, a_objHandle);
 			}
 
+			void UnbindObject(const BSTSmartPointer<Object>& a_obj)
+			{
+				using func_t = decltype(&ObjectBindPolicy::UnbindObject);
+				REL::Relocation<func_t> func{ REL::ID(522763) };
+				return func(this, a_obj);
+			}
+
 			// members
 			IVirtualMachine* vm;                                                                         // 10
 			IVMObjectBindInterface* bindInterface;                                                       // 18

diff --git a/CommonLibF4/include/RE/Bethesda/BSScriptUtil.h b/CommonLibF4/include/RE/Bethesda/BSScriptUtil.h
@@ -1300,15 +1300,15 @@ namespace RE::BSScript
 	}
 
 	template <class... Args>
-	void IVirtualMachine::DispatchMethodCall(
+	bool IVirtualMachine::DispatchMethodCall(
 		std::uint64_t a_objHandle,
 		const BSFixedString& a_objName,
 		const BSFixedString& a_funcName,
 		const BSTSmartPointer<IStackCallbackFunctor>& a_callback,
 		Args... a_args)
 	{
 		auto args = detail::FunctionArgs{ this, a_args... };
-		DispatchMethodCall(
+		return DispatchMethodCall(
 			a_objHandle,
 			a_objName,
 			a_funcName,