feat: merge pull request #8 from RunnerScrab/RunnerScrab_FixNativeMethodBinding

Runner scrab fix native method binding

Author: qudix

include/RE/B/BSScriptUtil.h

@@ -940,10 +940,7 @@ namespace RE::BSScript
 			const auto args = [&]<class T>(std::in_place_type_t<T>, std::size_t a_index) {
 				if (a_stackFrame.size > a_index) {
 					return UnpackVariable<detail::decay_t<T>>(
-						a_stack.GetStackFrameVariable(
-							pframe,
-							static_cast<std::uint32_t>(a_index),
-							page));
+						a_stackFrame.GetVariable(static_cast<std::uint32_t>(a_index),page));
 				} else {
 					assert(false);
 					return T();

include/RE/IDs.h

@@ -301,7 +301,12 @@ namespace RE::ID
 			inline constexpr REL::ID ctor{ 0 };                   // 196325
 			inline constexpr REL::ID dtor{ 0 };                   // 196333
 			inline constexpr REL::ID GetStackFrameVariable{ 0 };  // 196367
-			inline constexpr REL::ID GetPageForFrame{ 0 };        // 196366
+			inline constexpr REL::ID GetPageForFrame{ 138020 };   // 196366
+		}
+
+		namespace StackFrame
+		{
+			inline constexpr REL::ID GetVariable{ 84986 };
 		}
 
 		namespace Internal

include/RE/S/Stack.h

@@ -73,13 +73,6 @@ namespace RE::BSScript
 			return func(this, a_frame);
 		}
 
-		[[nodiscard]] Variable& GetStackFrameVariable(const StackFrame* a_frame, std::uint32_t a_index, std::uint32_t a_pageHint)
-		{
-			using func_t = decltype(&Stack::GetStackFrameVariable);
-			static REL::Relocation<func_t> func{ ID::BSScript::Stack::GetStackFrameVariable };
-			return func(this, a_frame, a_index, a_pageHint);
-		}
-
 		// members
 		IMemoryPagePolicy*                     policy;         // 08
 		void*                                  unk10;          // 10 - something to do with guards, guardPolicy maybe?

include/RE/S/StackFrame.h

@@ -18,9 +18,11 @@ namespace RE::BSScript
 			return parent->GetPageForFrame(this);
 		}
 
-		[[nodiscard]] Variable& GetStackFrameVariable(std::uint32_t a_index, std::uint32_t a_pageHint) const
+		[[nodiscard]] Variable& GetVariable(std::uint32_t a_index, std::uint32_t a_pageHint) const
 		{
-			return parent->GetStackFrameVariable(this, a_index, a_pageHint);
+			using func_t = decltype(&StackFrame::GetVariable);
+			static REL::Relocation<func_t> func{ ID::BSScript::StackFrame::GetVariable };
+			return func(this, a_index, a_pageHint);
 		}
 
 		// members