From 466edc0029d5fd638aeea77b575d3f0ad68d3125 Mon Sep 17 00:00:00 2001 From: Maxim Telezhenko Date: Fri, 21 Feb 2025 23:58:52 +0300 Subject: [PATCH 1/4] CSS v93 update --- extension.cpp | 14 ++++++++------ sourcemod_files/gamedata/blindhook.games.txt | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/extension.cpp b/extension.cpp index 90b7c16..5f2106c 100644 --- a/extension.cpp +++ b/extension.cpp @@ -63,10 +63,12 @@ bool __stdcall BlindHookHandler(CBaseEntity *pEntity, CBaseEntity *pevInflictor, __declspec(naked) void blindhook() { + __asm sub esp, 4 // Align to 16 __asm push [ebp+0x18] // pevAttacker __asm push [ebp+0x14] // pevInflictor - __asm push ebx // pEntity + __asm push edi // pEntity __asm call BlindHookHandler; + __asm add esp, 4 __asm test al, al; __asm jz Trampoline @@ -78,10 +80,10 @@ __declspec(naked) void blindhook() // Trampoline back __asm Trampoline: __asm _emit 0x8B - __asm _emit 0x03 + __asm _emit 0x07 __asm _emit 0x8D __asm _emit 0x4D - __asm _emit 0xD0 + __asm _emit 0xC8 __asm mov edx, g_addr_continue __asm jmp edx @@ -103,9 +105,9 @@ bool BlindHook::SDK_OnLoad(char *error, size_t maxlength, bool late) void *addr_hook; - addr_hook = (void*)((uintptr_t)addr + 0xCC); - g_addr_continue = (void*)((uintptr_t)addr + 0xD1); - g_addr_skip = (void*)((uintptr_t)addr + 0x68); + addr_hook = (void*)((uintptr_t)addr + 0xB4); + g_addr_continue = (void*)((uintptr_t)addr + 0xB9); + g_addr_skip = (void*)((uintptr_t)addr + 0x58); sharesys->RegisterLibrary(myself, "blindhook"); plsys->AddPluginsListener(this); diff --git a/sourcemod_files/gamedata/blindhook.games.txt b/sourcemod_files/gamedata/blindhook.games.txt index e7a3c47..5d1892d 100644 --- a/sourcemod_files/gamedata/blindhook.games.txt +++ b/sourcemod_files/gamedata/blindhook.games.txt @@ -7,7 +7,7 @@ "RadiusFlash" { "library" "server" - "linux" "\x55\x89\xE5\x57\x56\x8D\x4D\x08" + "linux" "\x55\x89\xE5\x57\x56\x53\x83\xEC\x60\x8B\x4D\x18" } } } From 4371f9ec19ef3dbeea638061b66861ead341450f Mon Sep 17 00:00:00 2001 From: Maxim Telezhenko Date: Sat, 22 Feb 2025 03:56:10 +0300 Subject: [PATCH 2/4] Fix build Sync build with hl2sdk-css and sm-1.11 --- .gitignore | 1 + AMBuildScript | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/build diff --git a/AMBuildScript b/AMBuildScript index 291cce9..176e2a1 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -178,7 +178,7 @@ class ExtensionConfig(object): '-fvisibility=hidden', ] cxx.cxxflags += [ - '-std=c++11', + '-std=c++14', '-fno-exceptions', '-fno-threadsafe-statics', '-Wno-non-virtual-dtor', @@ -360,6 +360,8 @@ class ExtensionConfig(object): lib_folder = os.path.join(sdk.path, 'linux_sdk') elif sdk.name in ['sdk2013', 'bms']: lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32') + elif sdk.name == 'css': + lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux') else: lib_folder = os.path.join(sdk.path, 'lib', 'linux') elif builder.target_platform == 'mac': From c752436fa4036334788dc5c1dbd1a46f42450c1c Mon Sep 17 00:00:00 2001 From: Maxim Telezhenko Date: Sat, 22 Feb 2025 23:56:12 +0300 Subject: [PATCH 3/4] Fix signature --- sourcemod_files/gamedata/blindhook.games.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sourcemod_files/gamedata/blindhook.games.txt b/sourcemod_files/gamedata/blindhook.games.txt index 5d1892d..b6526fe 100644 --- a/sourcemod_files/gamedata/blindhook.games.txt +++ b/sourcemod_files/gamedata/blindhook.games.txt @@ -7,7 +7,7 @@ "RadiusFlash" { "library" "server" - "linux" "\x55\x89\xE5\x57\x56\x53\x83\xEC\x60\x8B\x4D\x18" + "linux" "@_Z11RadiusFlash6VectorP11CBaseEntityS1_fii" } } } From e8839bc5edb72a4d1893e207c2fe939d5abc8fdd Mon Sep 17 00:00:00 2001 From: Maxim Telezhenko Date: Sun, 23 Feb 2025 00:06:31 +0300 Subject: [PATCH 4/4] bump ver 1.1-cssob --- smsdk_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smsdk_config.h b/smsdk_config.h index 2ad1d92..5ee8cc0 100644 --- a/smsdk_config.h +++ b/smsdk_config.h @@ -37,7 +37,7 @@ /* Basic information exposed publicly */ #define SMEXT_CONF_NAME "Blind Hook" #define SMEXT_CONF_DESCRIPTION "Adds SourcePawn hook for flashbang's blind action." -#define SMEXT_CONF_VERSION "1.0-cssob" +#define SMEXT_CONF_VERSION "1.1-cssob" #define SMEXT_CONF_AUTHOR "Kailo" #define SMEXT_CONF_URL "https://github.com/Kailo97" #define SMEXT_CONF_LOGTAG "Blind Hook"