diff --git a/r5dev/core/init.cpp b/r5dev/core/init.cpp index fbaa3b30..9c7448e1 100644 --- a/r5dev/core/init.cpp +++ b/r5dev/core/init.cpp @@ -218,9 +218,6 @@ void Systems_Init() ServerScriptRegister_Callback = Script_RegisterServerFunctions; CoreServerScriptRegister_Callback = Script_RegisterCoreServerFunctions; AdminPanelScriptRegister_Callback = Script_RegisterAdminPanelFunctions; -#else - CoreServerScriptRegister_Callback = Script_RegisterCoreServerStubs; - AdminPanelScriptRegister_Callback = Script_RegisterAdminPanelStubs; #endif// !CLIENT_DLL #ifndef SERVER_DLL diff --git a/r5dev/game/client/vscript_client.cpp b/r5dev/game/client/vscript_client.cpp index c865cb07..507b4523 100644 --- a/r5dev/game/client/vscript_client.cpp +++ b/r5dev/game/client/vscript_client.cpp @@ -415,34 +415,3 @@ 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 89f054e3..a2066ba4 100644 --- a/r5dev/game/client/vscript_client.h +++ b/r5dev/game/client/vscript_client.h @@ -32,9 +32,6 @@ 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), \ diff --git a/r5dev/game/shared/vscript_shared.cpp b/r5dev/game/shared/vscript_shared.cpp index 1cb43ac3..d8a1a77e 100644 --- a/r5dev/game/shared/vscript_shared.cpp +++ b/r5dev/game/shared/vscript_shared.cpp @@ -26,15 +26,6 @@ namespace VScriptCode { namespace Shared { - //----------------------------------------------------------------------------- - // Purpose: generic stub for unsupported functions - //----------------------------------------------------------------------------- - SQRESULT StubUnsupported(HSQUIRRELVM v) - { - v_SQVM_RaiseError(v, "This function is not supported on this build\n"); - return SQ_ERROR; - } - //----------------------------------------------------------------------------- // Purpose: expose SDK version to the VScript API //----------------------------------------------------------------------------- diff --git a/r5dev/game/shared/vscript_shared.h b/r5dev/game/shared/vscript_shared.h index 0591f348..3a3b8e77 100644 --- a/r5dev/game/shared/vscript_shared.h +++ b/r5dev/game/shared/vscript_shared.h @@ -16,7 +16,6 @@ namespace VScriptCode { namespace Shared { - SQRESULT StubUnsupported(HSQUIRRELVM v); SQRESULT GetSDKVersion(HSQUIRRELVM v); SQRESULT GetAvailableMaps(HSQUIRRELVM v); SQRESULT GetAvailablePlaylists(HSQUIRRELVM v); @@ -25,11 +24,6 @@ namespace VScriptCode void Script_RegisterCommonAbstractions(CSquirrelVM* s); -#define DEFINE_SCRIPTFUNC_STUBBED(s, functionName, returnType, parameters) \ - s->RegisterFunction(#functionName, MKSTRING(Script_##functionName), \ - "Stub function; not supported on this build.", #returnType, parameters, \ - &VScriptCode::Shared::StubUnsupported); \ - #define DEFINE_SHARED_SCRIPTFUNC_NAMED(s, functionName, helpString, \ returnType, parameters) \ s->RegisterFunction(#functionName, MKSTRING(Script_##functionName), \