Skip to content

Commit

Permalink
Remove uses of Autohook from clientchathooks.cpp (R2Northstar#819)
Browse files Browse the repository at this point in the history
* Manually hook CHudChat__AddGameLine
* Remove AUTOHOOK_INIT and AUTOHOOK_DISPATCH
  • Loading branch information
ASpoonPlaysGames authored and wolf109909 committed Nov 12, 2024
1 parent 1a9ca77 commit b4febbe
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions primedev/scripts/client/clientchathooks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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);
}

0 comments on commit b4febbe

Please sign in to comment.