From ee1fdca7a9ad1c37ba57aaec13e16f5462a593bf Mon Sep 17 00:00:00 2001 From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com> Date: Wed, 19 Jul 2023 16:19:34 +0200 Subject: [PATCH] Register admin panel/core server scriptfunc stubs for client.dll Stubbed to avoid compile errors. --- r5dev/core/init.cpp | 5 ++++- r5dev/game/client/vscript_client.cpp | 31 ++++++++++++++++++++++++++++ r5dev/game/client/vscript_client.h | 3 +++ 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp index 1529e28a..fbaa3b30 100644 --- a/r5dev/core/init.cpp +++ b/r5dev/core/init.cpp @@ -218,7 +218,10 @@ void Systems_Init() ServerScriptRegister_Callback = Script_RegisterServerFunctions; CoreServerScriptRegister_Callback = Script_RegisterCoreServerFunctions; AdminPanelScriptRegister_Callback = Script_RegisterAdminPanelFunctions; -#endif // !CLIENT_DLL +#else + CoreServerScriptRegister_Callback = Script_RegisterCoreServerStubs; + AdminPanelScriptRegister_Callback = Script_RegisterAdminPanelStubs; +#endif// !CLIENT_DLL #ifndef SERVER_DLL ClientScriptRegister_Callback = Script_RegisterClientFunctions; diff --git a/r5dev/game/client/vscript_client.cpp b/r5dev/game/client/vscript_client.cpp index 507b4523..c865cb07 100644 --- a/r5dev/game/client/vscript_client.cpp +++ b/r5dev/game/client/vscript_client.cpp @@ -415,3 +415,34 @@ void Script_RegisterCoreClientFunctions(CSquirrelVM* s) { DEFINE_CLIENT_SCRIPTFUNC_NAMED(s, IsClientDLL, "Returns whether this build is client only", "bool", ""); } + +//--------------------------------------------------------------------------------- +// Purpose: core server script stubs (stubbed to prevent script compile errors!!!) +// Input : *s - +//--------------------------------------------------------------------------------- +void Script_RegisterCoreServerStubs(CSquirrelVM* s) +{ + DEFINE_SCRIPTFUNC_STUBBED(s, IsServerActive, "bool", ""); + DEFINE_SCRIPTFUNC_STUBBED(s, IsDedicated, "bool", ""); + + DEFINE_SCRIPTFUNC_STUBBED(s, CreateServer, "void", "string, string, string, string, int"); + DEFINE_SCRIPTFUNC_STUBBED(s, DestroyServer, "void", ""); +} + +//--------------------------------------------------------------------------------- +// Purpose: admin panel script stubs (stubbed to prevent script compile errors!!!) +// Input : *s - +//--------------------------------------------------------------------------------- +void Script_RegisterAdminPanelStubs(CSquirrelVM* s) +{ + DEFINE_SCRIPTFUNC_STUBBED(s, GetNumHumanPlayers, "int", ""); + DEFINE_SCRIPTFUNC_STUBBED(s, GetNumFakeClients, "int", ""); + + DEFINE_SCRIPTFUNC_STUBBED(s, KickPlayerByName, "void", "string"); + DEFINE_SCRIPTFUNC_STUBBED(s, KickPlayerById, "void", "string"); + + DEFINE_SCRIPTFUNC_STUBBED(s, BanPlayerByName, "void", "string"); + DEFINE_SCRIPTFUNC_STUBBED(s, BanPlayerById, "void", "string"); + + DEFINE_SCRIPTFUNC_STUBBED(s, UnbanPlayer, "void", "string"); +} diff --git a/r5dev/game/client/vscript_client.h b/r5dev/game/client/vscript_client.h index a2066ba4..89f054e3 100644 --- a/r5dev/game/client/vscript_client.h +++ b/r5dev/game/client/vscript_client.h @@ -32,6 +32,9 @@ void Script_RegisterClientFunctions(CSquirrelVM* s); void Script_RegisterUIFunctions(CSquirrelVM* s); void Script_RegisterCoreClientFunctions(CSquirrelVM* s); +void Script_RegisterCoreServerStubs(CSquirrelVM* s); +void Script_RegisterAdminPanelStubs(CSquirrelVM* s); + #define DEFINE_CLIENT_SCRIPTFUNC_NAMED(s, functionName, helpString, \ returnType, parameters) \ s->RegisterFunction(#functionName, MKSTRING(Script_##functionName), \