From d840c819f9b8f8f805cc45174c1a3af624c66ed0 Mon Sep 17 00:00:00 2001 From: Ted Wollman <25165500+TheTedder@users.noreply.github.com> Date: Mon, 2 Oct 2023 14:29:30 -0400 Subject: [PATCH] Bump REFramework (#40) * Bump REFramework version to v1.5.2. * Update hooks with new signature. --- Hooks.cpp | 6 +++--- Hooks.h | 6 +++--- REFix.h | 2 +- REFramework | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Hooks.cpp b/Hooks.cpp index cadbe94..41e8d42 100644 --- a/Hooks.cpp +++ b/Hooks.cpp @@ -6,7 +6,7 @@ namespace REFix { extern const REF::API::Field* camera_param_field; extern const REF::API::Field* field_of_view_field; - int pre_update_pitch_yaw(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys) { + int pre_update_pitch_yaw(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys, unsigned long long ret_addr) { REF::API::ManagedObject* const camera_param = camera_param_field->get_data(argv[1]); const float fov = *(float*)field_of_view_field->get_data_raw(camera_param); float* input = (float*)&argv[2]; @@ -15,7 +15,7 @@ namespace REFix { return REFRAMEWORK_HOOK_CALL_ORIGINAL; } - int pre_add_rank_point_direct(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys) + int pre_add_rank_point_direct(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys, unsigned long long ret_addr) { const RankPointType rankType = *(RankPointType*)&argv[3]; @@ -29,7 +29,7 @@ namespace REFix { return REFRAMEWORK_HOOK_SKIP_ORIGINAL; } - int pre_set_interval_level(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys) + int pre_set_interval_level(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys, unsigned long long ret_addr) { int32_t* level = (int32_t*)&argv[2]; *level = 0; diff --git a/Hooks.h b/Hooks.h index 18e3582..3792874 100644 --- a/Hooks.h +++ b/Hooks.h @@ -2,7 +2,7 @@ #include "REFix.h" namespace REFix { - int pre_update_pitch_yaw(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys); - int pre_add_rank_point_direct(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys); - int pre_set_interval_level(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys); + int pre_update_pitch_yaw(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys, unsigned long long ret_addr); + int pre_add_rank_point_direct(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys, unsigned long long ret_addr); + int pre_set_interval_level(int argc, void** argv, REFrameworkTypeDefinitionHandle* arg_tys, unsigned long long ret_addr); } \ No newline at end of file diff --git a/REFix.h b/REFix.h index f7259f1..a56c7a8 100644 --- a/REFix.h +++ b/REFix.h @@ -24,7 +24,7 @@ namespace REF = reframework; namespace REFix { - static void post_hook_null(void** ret_val, REFrameworkTypeDefinitionHandle ret_ty) {} + static void post_hook_null(void** ret_val, REFrameworkTypeDefinitionHandle ret_ty, unsigned long long ret_addr) {} } extern "C" __declspec(dllexport) bool reframework_plugin_initialize(const REFrameworkPluginInitializeParam* param); diff --git a/REFramework b/REFramework index 8bca458..9f479ea 160000 --- a/REFramework +++ b/REFramework @@ -1 +1 @@ -Subproject commit 8bca45890f3f27942c1eda3bfc9bce0b023e1d79 +Subproject commit 9f479eae9c017763d9e33822fa323644576b5dfa