From 23fda0b842560d2f3cf64ecf9a57d5ad2861e488 Mon Sep 17 00:00:00 2001 From: Maya Date: Sun, 13 Nov 2022 04:01:14 +0100 Subject: Squirrel functions auto bind (#299) * Add defines to auto add squirrel funcs it brokey * Make it Work changed all squirrel function definitions to this system * Add defines to auto add squirrel funcs it brokey Co-authored-by: Emma-Miler <27428383+emma-miler@users.noreply.github.com> * Make it Work changed all squirrel function definitions to this system Co-authored-by: Emma-Miler <27428383+emma-miler@users.noreply.github.com> * Formatting * Good old Formatting commit * HelloGecko * Formatting Finalv2ForRealThisTime * idk anymore * i hate formatting * Rename some * Rename macro * Change function names to more human-readable * Revert to using old ScriptContext definition * Formatting Co-authored-by: RoyalBlue1 Co-authored-by: Emma-Miler <27428383+emma-miler@users.noreply.github.com> Co-authored-by: Emma Miler Co-authored-by: BobTheBob <32057864+BobTheBob9@users.noreply.github.com> --- NorthstarDLL/clientchathooks.cpp | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) (limited to 'NorthstarDLL/clientchathooks.cpp') diff --git a/NorthstarDLL/clientchathooks.cpp b/NorthstarDLL/clientchathooks.cpp index a7a42689..3346ea2e 100644 --- a/NorthstarDLL/clientchathooks.cpp +++ b/NorthstarDLL/clientchathooks.cpp @@ -1,5 +1,6 @@ #include "pch.h" #include "squirrel.h" + #include "serverchathooks.h" #include "localchatwriter.h" @@ -43,41 +44,29 @@ void, __fastcall, (void* self, const char* message, int inboxId, bool isTeam, bo CHudChat__AddGameLine(hud, message, inboxId, isTeam, isDead); } -// void NSChatWrite( int context, string str ) -SQRESULT SQ_ChatWrite(HSquirrelVM* sqvm) +ADD_SQFUNC("void", NSChatWrite, "int context, string text", "", ScriptContext::CLIENT) { - int context = g_pSquirrel->getinteger(sqvm, 1); + int chatContext = g_pSquirrel->getinteger(sqvm, 1); const char* str = g_pSquirrel->getstring(sqvm, 2); - LocalChatWriter((LocalChatWriter::Context)context).Write(str); + LocalChatWriter((LocalChatWriter::Context)chatContext).Write(str); return SQRESULT_NULL; } -// void NSChatWriteRaw( int context, string str ) -SQRESULT SQ_ChatWriteRaw(HSquirrelVM* sqvm) +ADD_SQFUNC("void", NSChatWriteRaw, "int context, string text", "", ScriptContext::CLIENT) { - int context = g_pSquirrel->getinteger(sqvm, 1); + int chatContext = g_pSquirrel->getinteger(sqvm, 1); const char* str = g_pSquirrel->getstring(sqvm, 2); - LocalChatWriter((LocalChatWriter::Context)context).InsertText(str); + LocalChatWriter((LocalChatWriter::Context)chatContext).InsertText(str); return SQRESULT_NULL; } -// void NSChatWriteLine( int context, string str ) -SQRESULT SQ_ChatWriteLine(HSquirrelVM* sqvm) +ADD_SQFUNC("void", NSChatWriteLine, "int context, string text", "", ScriptContext::CLIENT) { - int context = g_pSquirrel->getinteger(sqvm, 1); + int chatContext = g_pSquirrel->getinteger(sqvm, 1); const char* str = g_pSquirrel->getstring(sqvm, 2); - LocalChatWriter((LocalChatWriter::Context)context).WriteLine(str); + LocalChatWriter((LocalChatWriter::Context)chatContext).WriteLine(str); return SQRESULT_NULL; } - -ON_DLL_LOAD_CLIENT_RELIESON("client.dll", ClientChatHooks, ClientSquirrel, (CModule module)) -{ - AUTOHOOK_DISPATCH() - - g_pSquirrel->AddFuncRegistration("void", "NSChatWrite", "int context, string text", "", SQ_ChatWrite); - g_pSquirrel->AddFuncRegistration("void", "NSChatWriteRaw", "int context, string text", "", SQ_ChatWriteRaw); - g_pSquirrel->AddFuncRegistration("void", "NSChatWriteLine", "int context, string text", "", SQ_ChatWriteLine); -} -- cgit v1.2.3