diff options
| author | Jack <66967891+ASpoonPlaysGames@users.noreply.github.com> | 2024-11-10 23:36:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-11 00:36:22 +0100 |
| commit | 0de2a3a1d9995e743b180431fa7b925651bb241e (patch) | |
| tree | 1ba5e4441b1a2991f2c2fe0634b95bb9ee0fa2b9 | |
| parent | 10041ca495aa35154671a4ab5a9737ddeee83dd0 (diff) | |
| download | NorthstarLauncher-0de2a3a1d9995e743b180431fa7b925651bb241e.tar.gz NorthstarLauncher-0de2a3a1d9995e743b180431fa7b925651bb241e.zip | |
Remove uses of Autohook from `clientchathooks.cpp` (#819)v1.28.5-rc1
* Manually hook CHudChat__AddGameLine
* Remove AUTOHOOK_INIT and AUTOHOOK_DISPATCH
| -rw-r--r-- | primedev/scripts/client/clientchathooks.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/primedev/scripts/client/clientchathooks.cpp b/primedev/scripts/client/clientchathooks.cpp index e084f47e..c0a06dd2 100644 --- a/primedev/scripts/client/clientchathooks.cpp +++ b/primedev/scripts/client/clientchathooks.cpp @@ -6,12 +6,8 @@ #include <rapidjson/document.h> -AUTOHOOK_INIT() - -// clang-format off -AUTOHOOK(CHudChat__AddGameLine, client.dll + 0x22E580, -void, __fastcall, (void* self, const char* message, int inboxId, bool isTeam, bool isDead)) -// clang-format on +static void(__fastcall* o_pCHudChat__AddGameLine)(void* self, const char* message, int inboxId, bool isTeam, bool isDead) = nullptr; +static void __fastcall h_CHudChat__AddGameLine(void* self, const char* message, int inboxId, bool isTeam, bool isDead) { // This hook is called for each HUD, but we only want our logic to run once. if (self != *CHudChat::allHuds) @@ -36,7 +32,7 @@ void, __fastcall, (void* self, const char* message, int inboxId, bool isTeam, bo "CHudChat_ProcessMessageStartThread", static_cast<int>(senderId) - 1, payload, isTeam, isDead, type); if (result == SQRESULT_ERROR) for (CHudChat* hud = *CHudChat::allHuds; hud != NULL; hud = hud->next) - CHudChat__AddGameLine(hud, message, inboxId, isTeam, isDead); + o_pCHudChat__AddGameLine(hud, message, inboxId, isTeam, isDead); } ADD_SQFUNC("void", NSChatWrite, "int context, string text", "", ScriptContext::CLIENT) @@ -68,5 +64,6 @@ ADD_SQFUNC("void", NSChatWriteLine, "int context, string text", "", ScriptContex ON_DLL_LOAD_CLIENT("client.dll", ClientChatHooks, (CModule module)) { - AUTOHOOK_DISPATCH() + o_pCHudChat__AddGameLine = module.Offset(0x22E580).RCast<decltype(o_pCHudChat__AddGameLine)>(); + HookAttach(&(PVOID&)o_pCHudChat__AddGameLine, (PVOID)h_CHudChat__AddGameLine); } |