Push int64 Address under dhook callbacks

Author: Kenzzer

extensions/dhooks/src/capsule.cpp

@@ -91,6 +91,7 @@ std::uint32_t Capsule::AddCallback(SourcePawn::IPluginFunction* callback, Source
 	cb.associated_capsule = this;
 	cb.callback = callback;
 	cb.remove_callback = remove_callback;
+	cb.using_int64_address = (callback->GetParentRuntime()->FindPubvarByName("__Int64_Address__", nullptr) == SP_ERROR_NONE);
 
 	auto plugin_it = locals::plugin_hook_ids.find(callback->GetParentRuntime()->GetDefaultContext());
 	if (plugin_it == locals::plugin_hook_ids.end()) {

extensions/dhooks/src/capsule.hpp

@@ -147,7 +147,12 @@ void Capsule::PrePostHookLoop(std::uint8_t* saved_register, bool post) const {
                         }
                         hook.callback->PushCell(entity_index.value_or(-1));
                     } else if (hook.this_pointer_type == sp::ThisPointer_Address) {
-                        hook.callback->PushCell(globals::sourcemod->ToPseudoAddress(this_ptr));
+                        if (hook.using_int64_address) {
+                            std::int64_t sm_address = reinterpret_cast<std::int64_t>(this_ptr);
+                            hook.callback->PushArray((cell_t*)&sm_address, 2);
+                        } else {
+                            hook.callback->PushCell(reinterpret_cast<std::intptr_t>(this_ptr));
+                        }
                     }
                 }
 

extensions/dhooks/src/hook.hpp

@@ -15,6 +15,7 @@ struct HookCallback {
 	Capsule* associated_capsule;
 	SourcePawn::IPluginFunction* callback;
 	SourcePawn::IPluginFunction* remove_callback;
+	bool using_int64_address;
 };
 
 }