diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9734978..c2da592 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v7 with: repository: alliedmodders/metamod-source - ref: master + ref: 7ec0f16948ab3a0910a98b4ac10e1c0e360d5339 path: mmsource-2.0 submodules: recursive diff --git a/AMBuildScript b/AMBuildScript index cc5c402..77353ac 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -278,7 +278,7 @@ class MMSPluginConfig(object): cxx.cxxincludes += [ os.path.join(context.currentSourcePath), os.path.join(mms_core_path), - os.path.join(self.mms_root, 'third_party', 'khook', 'include'), + os.path.join(mms_core_path, 'sourcehook'), ] defines = [] diff --git a/MovementUnlocker.cpp b/MovementUnlocker.cpp index 2781173..a700123 100644 --- a/MovementUnlocker.cpp +++ b/MovementUnlocker.cpp @@ -19,7 +19,7 @@ #include #include "MovementUnlocker.h" -#include "khook/memory.hpp" +#include #ifdef _WIN32 #include #elif __linux__ @@ -110,7 +110,7 @@ bool MovementUnlocker::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxl return false; } - KHook::Memory::SetAccess((void*)pPatchAddress, PatchLen, KHook::Memory::READ | KHook::Memory::WRITE | KHook::Memory::EXECUTE); + SourceHook::SetMemAccess((void*)pPatchAddress, PatchLen, SH_MEM_READ | SH_MEM_WRITE | SH_MEM_EXEC); #ifdef _WIN32 const char* patchBytes[] = {"\xE9", "\xB0", "\x00", "\x00", "\x00", "\x90"}; @@ -122,7 +122,7 @@ bool MovementUnlocker::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxl *(unsigned char*)(pPatchAddress + i) = ((unsigned char*)"\xEB")[0]; #endif - KHook::Memory::SetAccess((void*)pPatchAddress, PatchLen, KHook::Memory::READ | KHook::Memory::EXECUTE); + SourceHook::SetMemAccess((void*)pPatchAddress, PatchLen, SH_MEM_READ | SH_MEM_EXEC); META_CONPRINTF( "[Movement Unlocker] Successfully patched Movement Unlocker!\n" ); return true; @@ -154,7 +154,7 @@ const char *MovementUnlocker::GetLicense() const char *MovementUnlocker::GetVersion() { - return "2.0.1"; + return "1.13"; } const char *MovementUnlocker::GetDate()