mirror of
https://github.com/Mauler125/r5sdk.git
synced 2025-02-09 19:15:03 +01:00
Improve naming convention in sqcript.h/cpp
Use Squirrel's naming convention.
This commit is contained in:
Kawe Mazidjatari
parent
8e880b8052
commit
7818385fa0
@ -12,27 +12,27 @@
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: registers and exposes code functions to target context
|
||||
// Input : *pSquirrelVM -
|
||||
// *szName -
|
||||
// *szHelpString -
|
||||
// *szRetValType -
|
||||
// *szArgTypes -
|
||||
// *pFunction -
|
||||
// Input : *s -
|
||||
// *scriptname -
|
||||
// *nativename -
|
||||
// *helpstring -
|
||||
// *returntype -
|
||||
// *arguments -
|
||||
// *functor -
|
||||
//---------------------------------------------------------------------------------
|
||||
SQRESULT Script_RegisterFunction(CSquirrelVM* pSquirrelVM, const SQChar* szScriptName,const SQChar* szNativeName,
|
||||
const SQChar* szHelpString, const SQChar* szRetValType, const SQChar* szArgTypes, void* pFunction)
|
||||
SQRESULT Script_RegisterFunction(CSquirrelVM* s, const SQChar* scriptname, const SQChar* nativename,
|
||||
const SQChar* helpstring, const SQChar* returntype, const SQChar* parameters, void* functor)
|
||||
{
|
||||
ScriptFunctionBinding_t* sqFunc = new ScriptFunctionBinding_t();
|
||||
ScriptFunctionBinding_t* binding = MemAllocSingleton()->Alloc<ScriptFunctionBinding_t>(sizeof(ScriptFunctionBinding_t));
|
||||
binding->_scriptname = scriptname;
|
||||
binding->_nativename = nativename;
|
||||
binding->_helpstring = helpstring;
|
||||
binding->_returntype = returntype;
|
||||
binding->_parameters = parameters;
|
||||
binding->_functor = functor;
|
||||
|
||||
sqFunc->m_szScriptName = szScriptName;
|
||||
sqFunc->m_szNativeName = szNativeName;
|
||||
sqFunc->m_szHelpString = szHelpString;
|
||||
sqFunc->m_szRetValType = szRetValType;
|
||||
sqFunc->m_szArgTypes = szArgTypes;
|
||||
sqFunc->m_pFunction = pFunction;
|
||||
|
||||
SQRESULT results = v_Script_RegisterFunction(pSquirrelVM, sqFunc, 1);
|
||||
delete sqFunc;
|
||||
SQRESULT results = v_Script_RegisterFunction(s, binding, 1);
|
||||
MemAllocSingleton()->Free<ScriptFunctionBinding_t>(binding);
|
||||
|
||||
return results;
|
||||
}
|
||||
@ -40,105 +40,105 @@ SQRESULT Script_RegisterFunction(CSquirrelVM* pSquirrelVM, const SQChar* szScrip
|
||||
#ifndef CLIENT_DLL
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: registers script functions in SERVER context
|
||||
// Input : *pSquirrelVM -
|
||||
// Input : *s -
|
||||
//---------------------------------------------------------------------------------
|
||||
void Script_RegisterServerFunctions(CSquirrelVM* pSquirrelVM)
|
||||
void Script_RegisterServerFunctions(CSquirrelVM* s)
|
||||
{
|
||||
Script_RegisterFunction(pSquirrelVM, "SDKNativeTest", "Script_SDKNativeTest", "Native SERVER test function", "void", "", &VSquirrel::SHARED::SDKNativeTest);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetSDKVersion", "Script_GetSDKVersion", "Gets the SDK version as a string", "string", "", &VSquirrel::SHARED::GetSDKVersion);
|
||||
Script_RegisterFunction(s, "SDKNativeTest", "Script_SDKNativeTest", "Native SERVER test function", "void", "", &VSquirrel::SHARED::SDKNativeTest);
|
||||
Script_RegisterFunction(s, "GetSDKVersion", "Script_GetSDKVersion", "Gets the SDK version as a string", "string", "", &VSquirrel::SHARED::GetSDKVersion);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "GetNumHumanPlayers", "Script_GetNumHumanPlayers", "Gets the number of human players on the server", "int", "", &VSquirrel::SERVER::GetNumHumanPlayers);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetNumFakeClients", "Script_GetNumFakeClients", "Gets the number of bot players on the server", "int", "", &VSquirrel::SERVER::GetNumFakeClients);
|
||||
Script_RegisterFunction(s, "GetNumHumanPlayers", "Script_GetNumHumanPlayers", "Gets the number of human players on the server", "int", "", &VSquirrel::SERVER::GetNumHumanPlayers);
|
||||
Script_RegisterFunction(s, "GetNumFakeClients", "Script_GetNumFakeClients", "Gets the number of bot players on the server", "int", "", &VSquirrel::SERVER::GetNumFakeClients);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "GetAvailableMaps", "Script_GetAvailableMaps", "Gets an array of all available maps", "array< string >", "", &VSquirrel::SHARED::GetAvailableMaps);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetAvailablePlaylists", "Script_GetAvailablePlaylists", "Gets an array of all available playlists", "array< string >", "", &VSquirrel::SHARED::GetAvailablePlaylists);
|
||||
Script_RegisterFunction(s, "GetAvailableMaps", "Script_GetAvailableMaps", "Gets an array of all available maps", "array< string >", "", &VSquirrel::SHARED::GetAvailableMaps);
|
||||
Script_RegisterFunction(s, "GetAvailablePlaylists", "Script_GetAvailablePlaylists", "Gets an array of all available playlists", "array< string >", "", &VSquirrel::SHARED::GetAvailablePlaylists);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "KickPlayerByName", "Script_KickPlayerByName", "Kicks a player from the server by name", "void", "string", &VSquirrel::SHARED::KickPlayerByName);
|
||||
Script_RegisterFunction(pSquirrelVM, "KickPlayerById", "Script_KickPlayerById", "Kicks a player from the server by handle or nucleus id", "void", "string", &VSquirrel::SHARED::KickPlayerById);
|
||||
Script_RegisterFunction(s, "KickPlayerByName", "Script_KickPlayerByName", "Kicks a player from the server by name", "void", "string", &VSquirrel::SHARED::KickPlayerByName);
|
||||
Script_RegisterFunction(s, "KickPlayerById", "Script_KickPlayerById", "Kicks a player from the server by handle or nucleus id", "void", "string", &VSquirrel::SHARED::KickPlayerById);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "BanPlayerByName", "Script_BanPlayerByName", "Bans a player from the server by name", "void", "string", &VSquirrel::SHARED::BanPlayerByName);
|
||||
Script_RegisterFunction(pSquirrelVM, "BanPlayerById", "Script_BanPlayerById", "Bans a player from the server by handle or nucleus id", "void", "string", &VSquirrel::SHARED::BanPlayerById);
|
||||
Script_RegisterFunction(s, "BanPlayerByName", "Script_BanPlayerByName", "Bans a player from the server by name", "void", "string", &VSquirrel::SHARED::BanPlayerByName);
|
||||
Script_RegisterFunction(s, "BanPlayerById", "Script_BanPlayerById", "Bans a player from the server by handle or nucleus id", "void", "string", &VSquirrel::SHARED::BanPlayerById);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "UnbanPlayer", "Script_UnbanPlayer", "Unbans a player from the server by nucleus id or ip address", "void", "string", &VSquirrel::SHARED::UnbanPlayer);
|
||||
Script_RegisterFunction(s, "UnbanPlayer", "Script_UnbanPlayer", "Unbans a player from the server by nucleus id or ip address", "void", "string", &VSquirrel::SHARED::UnbanPlayer);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "ShutdownHostGame", "Script_ShutdownHostGame", "Shuts the local host game down", "void", "", &VSquirrel::SHARED::ShutdownHostGame);
|
||||
Script_RegisterFunction(s, "ShutdownHostGame", "Script_ShutdownHostGame", "Shuts the local host game down", "void", "", &VSquirrel::SHARED::ShutdownHostGame);
|
||||
}
|
||||
#endif // !CLIENT_DLL
|
||||
|
||||
#ifndef DEDICATED
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: registers script functions in CLIENT context
|
||||
// Input : *pSquirrelVM -
|
||||
// Input : *s -
|
||||
//---------------------------------------------------------------------------------
|
||||
void Script_RegisterClientFunctions(CSquirrelVM* pSquirrelVM)
|
||||
void Script_RegisterClientFunctions(CSquirrelVM* s)
|
||||
{
|
||||
Script_RegisterFunction(pSquirrelVM, "SDKNativeTest", "Script_SDKNativeTest", "Native CLIENT test function", "void", "", &VSquirrel::SHARED::SDKNativeTest);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetSDKVersion", "Script_GetSDKVersion", "Gets the SDK version as a string", "string", "", &VSquirrel::SHARED::GetSDKVersion);
|
||||
Script_RegisterFunction(s, "SDKNativeTest", "Script_SDKNativeTest", "Native CLIENT test function", "void", "", &VSquirrel::SHARED::SDKNativeTest);
|
||||
Script_RegisterFunction(s, "GetSDKVersion", "Script_GetSDKVersion", "Gets the SDK version as a string", "string", "", &VSquirrel::SHARED::GetSDKVersion);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "GetAvailableMaps", "Script_GetAvailableMaps", "Gets an array of all available maps", "array< string >", "", &VSquirrel::SHARED::GetAvailableMaps);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetAvailablePlaylists", "Script_GetAvailablePlaylists", "Gets an array of all available playlists", "array< string >", "", &VSquirrel::SHARED::GetAvailablePlaylists);
|
||||
Script_RegisterFunction(s, "GetAvailableMaps", "Script_GetAvailableMaps", "Gets an array of all available maps", "array< string >", "", &VSquirrel::SHARED::GetAvailableMaps);
|
||||
Script_RegisterFunction(s, "GetAvailablePlaylists", "Script_GetAvailablePlaylists", "Gets an array of all available playlists", "array< string >", "", &VSquirrel::SHARED::GetAvailablePlaylists);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "ShutdownHostGame", "Script_ShutdownHostGame", "Shuts the local host game down", "void", "", &VSquirrel::SHARED::ShutdownHostGame);
|
||||
Script_RegisterFunction(s, "ShutdownHostGame", "Script_ShutdownHostGame", "Shuts the local host game down", "void", "", &VSquirrel::SHARED::ShutdownHostGame);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: registers script functions in UI context
|
||||
// Input : *pSquirrelVM -
|
||||
// Input : *s -
|
||||
//---------------------------------------------------------------------------------
|
||||
void Script_RegisterUIFunctions(CSquirrelVM* pSquirrelVM)
|
||||
void Script_RegisterUIFunctions(CSquirrelVM* s)
|
||||
{
|
||||
Script_RegisterFunction(pSquirrelVM, "SDKNativeTest", "Script_SDKNativeTest", "Native UI test function", "void", "", &VSquirrel::SHARED::SDKNativeTest);
|
||||
Script_RegisterFunction(s, "SDKNativeTest", "Script_SDKNativeTest", "Native UI test function", "void", "", &VSquirrel::SHARED::SDKNativeTest);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "RefreshServerList", "Script_RefreshServerList", "Refreshes the public server list and returns the count", "int", "", &VSquirrel::UI::RefreshServerCount);
|
||||
Script_RegisterFunction(s, "RefreshServerList", "Script_RefreshServerList", "Refreshes the public server list and returns the count", "int", "", &VSquirrel::UI::RefreshServerCount);
|
||||
|
||||
// Functions for retrieving server browser data
|
||||
Script_RegisterFunction(pSquirrelVM, "GetServerName", "Script_GetServerName", "Gets the name of the server at the specified index of the server list", "string", "int", &VSquirrel::UI::GetServerName);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetServerDescription", "Script_GetServerDescription", "Gets the description of the server at the specified index of the server list", "string", "int", &VSquirrel::UI::GetServerDescription);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetServerMap", "Script_GetServerMap", "Gets the map of the server at the specified index of the server list", "string", "int", &VSquirrel::UI::GetServerMap);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetServerPlaylist", "Script_GetServerPlaylist", "Gets the playlist of the server at the specified index of the server list", "string", "int", &VSquirrel::UI::GetServerPlaylist);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetServerCurrentPlayers", "Script_GetServerCurrentPlayers", "Gets the current player count of the server at the specified index of the server list", "int", "int", &VSquirrel::UI::GetServerCurrentPlayers);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetServerMaxPlayers", "Script_GetServerMaxPlayers", "Gets the max player count of the server at the specified index of the server list", "int", "int", &VSquirrel::UI::GetServerMaxPlayers);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetServerCount", "Script_GetServerCount", "Gets the number of public servers", "int", "", &VSquirrel::UI::GetServerCount);
|
||||
Script_RegisterFunction(s, "GetServerName", "Script_GetServerName", "Gets the name of the server at the specified index of the server list", "string", "int", &VSquirrel::UI::GetServerName);
|
||||
Script_RegisterFunction(s, "GetServerDescription", "Script_GetServerDescription", "Gets the description of the server at the specified index of the server list", "string", "int", &VSquirrel::UI::GetServerDescription);
|
||||
Script_RegisterFunction(s, "GetServerMap", "Script_GetServerMap", "Gets the map of the server at the specified index of the server list", "string", "int", &VSquirrel::UI::GetServerMap);
|
||||
Script_RegisterFunction(s, "GetServerPlaylist", "Script_GetServerPlaylist", "Gets the playlist of the server at the specified index of the server list", "string", "int", &VSquirrel::UI::GetServerPlaylist);
|
||||
Script_RegisterFunction(s, "GetServerCurrentPlayers", "Script_GetServerCurrentPlayers", "Gets the current player count of the server at the specified index of the server list", "int", "int", &VSquirrel::UI::GetServerCurrentPlayers);
|
||||
Script_RegisterFunction(s, "GetServerMaxPlayers", "Script_GetServerMaxPlayers", "Gets the max player count of the server at the specified index of the server list", "int", "int", &VSquirrel::UI::GetServerMaxPlayers);
|
||||
Script_RegisterFunction(s, "GetServerCount", "Script_GetServerCount", "Gets the number of public servers", "int", "", &VSquirrel::UI::GetServerCount);
|
||||
|
||||
// Misc main menu functions
|
||||
Script_RegisterFunction(pSquirrelVM, "GetSDKVersion", "Script_GetSDKVersion", "Gets the SDK version as a string", "string", "", &VSquirrel::SHARED::GetSDKVersion);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetPromoData", "Script_GetPromoData", "Gets promo data for specified slot type", "string", "int", &VSquirrel::UI::GetPromoData);
|
||||
Script_RegisterFunction(s, "GetSDKVersion", "Script_GetSDKVersion", "Gets the SDK version as a string", "string", "", &VSquirrel::SHARED::GetSDKVersion);
|
||||
Script_RegisterFunction(s, "GetPromoData", "Script_GetPromoData", "Gets promo data for specified slot type", "string", "int", &VSquirrel::UI::GetPromoData);
|
||||
|
||||
// Functions for connecting to servers
|
||||
Script_RegisterFunction(pSquirrelVM, "CreateServer", "Script_CreateServer", "Start server with the specified settings", "void", "string, string, string, string, int", &VSquirrel::UI::CreateServerFromMenu);
|
||||
Script_RegisterFunction(pSquirrelVM, "SetEncKeyAndConnect", "Script_SetEncKeyAndConnect", "Set the encryption key to that of the specified server and connects to it", "void", "int", &VSquirrel::UI::SetEncKeyAndConnect);
|
||||
Script_RegisterFunction(pSquirrelVM, "JoinPrivateServerFromMenu", "Script_JoinPrivateServerFromMenu", "Joins private server by token", "void", "string", &VSquirrel::UI::JoinPrivateServerFromMenu);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetPrivateServerMessage", "Script_GetPrivateServerMessage", "Gets private server join status message", "string", "string", &VSquirrel::UI::GetPrivateServerMessage);
|
||||
Script_RegisterFunction(pSquirrelVM, "ConnectToIPFromMenu", "Script_ConnectToIPFromMenu", "Joins server by ip address and encryption key", "void", "string, string", &VSquirrel::UI::ConnectToIPFromMenu);
|
||||
Script_RegisterFunction(s, "CreateServer", "Script_CreateServer", "Start server with the specified settings", "void", "string, string, string, string, int", &VSquirrel::UI::CreateServerFromMenu);
|
||||
Script_RegisterFunction(s, "SetEncKeyAndConnect", "Script_SetEncKeyAndConnect", "Set the encryption key to that of the specified server and connects to it", "void", "int", &VSquirrel::UI::SetEncKeyAndConnect);
|
||||
Script_RegisterFunction(s, "JoinPrivateServerFromMenu", "Script_JoinPrivateServerFromMenu", "Joins private server by token", "void", "string", &VSquirrel::UI::JoinPrivateServerFromMenu);
|
||||
Script_RegisterFunction(s, "GetPrivateServerMessage", "Script_GetPrivateServerMessage", "Gets private server join status message", "string", "string", &VSquirrel::UI::GetPrivateServerMessage);
|
||||
Script_RegisterFunction(s, "ConnectToIPFromMenu", "Script_ConnectToIPFromMenu", "Joins server by ip address and encryption key", "void", "string, string", &VSquirrel::UI::ConnectToIPFromMenu);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "GetAvailableMaps", "Script_GetAvailableMaps", "Gets an array of all available maps", "array< string >", "", &VSquirrel::SHARED::GetAvailableMaps);
|
||||
Script_RegisterFunction(pSquirrelVM, "GetAvailablePlaylists", "Script_GetAvailablePlaylists", "Gets an array of all available playlists", "array< string >", "", &VSquirrel::SHARED::GetAvailablePlaylists);
|
||||
Script_RegisterFunction(s, "GetAvailableMaps", "Script_GetAvailableMaps", "Gets an array of all available maps", "array< string >", "", &VSquirrel::SHARED::GetAvailableMaps);
|
||||
Script_RegisterFunction(s, "GetAvailablePlaylists", "Script_GetAvailablePlaylists", "Gets an array of all available playlists", "array< string >", "", &VSquirrel::SHARED::GetAvailablePlaylists);
|
||||
#ifndef CLIENT_DLL
|
||||
Script_RegisterFunction(pSquirrelVM, "KickPlayerByName", "Script_KickPlayerByName", "Kicks a player from the server by name", "void", "string", &VSquirrel::SHARED::KickPlayerByName);
|
||||
Script_RegisterFunction(pSquirrelVM, "KickPlayerById", "Script_KickPlayerById", "Kicks a player from the server by handle or nucleus id", "void", "string", &VSquirrel::SHARED::KickPlayerById);
|
||||
Script_RegisterFunction(s, "KickPlayerByName", "Script_KickPlayerByName", "Kicks a player from the server by name", "void", "string", &VSquirrel::SHARED::KickPlayerByName);
|
||||
Script_RegisterFunction(s, "KickPlayerById", "Script_KickPlayerById", "Kicks a player from the server by handle or nucleus id", "void", "string", &VSquirrel::SHARED::KickPlayerById);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "BanPlayerByName", "Script_BanPlayerByName", "Bans a player from the server by name", "void", "string", &VSquirrel::SHARED::BanPlayerByName);
|
||||
Script_RegisterFunction(pSquirrelVM, "BanPlayerById", "Script_BanPlayerById", "Bans a player from the server by handle or nucleus id", "void", "string", &VSquirrel::SHARED::BanPlayerById);
|
||||
Script_RegisterFunction(s, "BanPlayerByName", "Script_BanPlayerByName", "Bans a player from the server by name", "void", "string", &VSquirrel::SHARED::BanPlayerByName);
|
||||
Script_RegisterFunction(s, "BanPlayerById", "Script_BanPlayerById", "Bans a player from the server by handle or nucleus id", "void", "string", &VSquirrel::SHARED::BanPlayerById);
|
||||
|
||||
Script_RegisterFunction(pSquirrelVM, "UnbanPlayer", "Script_UnbanPlayer", "Unbans a player from the server by nucleus id or ip address", "void", "string", &VSquirrel::SHARED::UnbanPlayer);
|
||||
Script_RegisterFunction(s, "UnbanPlayer", "Script_UnbanPlayer", "Unbans a player from the server by nucleus id or ip address", "void", "string", &VSquirrel::SHARED::UnbanPlayer);
|
||||
#endif // !CLIENT_DLL
|
||||
Script_RegisterFunction(pSquirrelVM, "ShutdownHostGame", "Script_ShutdownHostGame", "Shuts the local host game down", "void", "", &VSquirrel::SHARED::ShutdownHostGame);
|
||||
Script_RegisterFunction(s, "ShutdownHostGame", "Script_ShutdownHostGame", "Shuts the local host game down", "void", "", &VSquirrel::SHARED::ShutdownHostGame);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: registers global constant for target context
|
||||
// Input : *pSquirrelVM -
|
||||
// Input : *v -
|
||||
// *name -
|
||||
// val -
|
||||
// value -
|
||||
//---------------------------------------------------------------------------------
|
||||
SQRESULT Script_RegisterConstant(CSquirrelVM* pSquirrelVM, const SQChar* name, SQInteger val)
|
||||
SQRESULT Script_RegisterConstant(CSquirrelVM* s, const SQChar* name, SQInteger value)
|
||||
{
|
||||
return v_Script_RegisterConstant(pSquirrelVM, name, val);
|
||||
return v_Script_RegisterConstant(s, name, value);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: Initialize all CLIENT/UI global structs and register SDK (CLIENT/UI) script functions
|
||||
// Input : *pSquirrelVM -
|
||||
// Input : *v -
|
||||
// context - (1 = CLIENT 2 = UI)
|
||||
//---------------------------------------------------------------------------------
|
||||
SQRESULT Script_InitializeCLGlobalStructs(HSQUIRRELVM v, SQCONTEXT context)
|
||||
@ -156,7 +156,7 @@ SQRESULT Script_InitializeCLGlobalStructs(HSQUIRRELVM v, SQCONTEXT context)
|
||||
#ifndef CLIENT_DLL
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: Initialize all SERVER global structs and register SDK (SERVER) script functions
|
||||
// Input : *pSquirrelVM -
|
||||
// Input : *v -
|
||||
//---------------------------------------------------------------------------------
|
||||
void Script_InitializeSVGlobalStructs(HSQUIRRELVM v)
|
||||
{
|
||||
@ -182,12 +182,12 @@ SQBool Script_CreateServerVM()
|
||||
#ifndef DEDICATED
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: Creates the CLIENT Squirrel VM
|
||||
// Input : *pHlClient -
|
||||
// Input : *hlClient -
|
||||
// Output : True on success, false on failure
|
||||
//---------------------------------------------------------------------------------
|
||||
SQBool Script_CreateClientVM(CHLClient* pHlClient)
|
||||
SQBool Script_CreateClientVM(CHLClient* hlclient)
|
||||
{
|
||||
SQBool results = v_Script_CreateClientVM(pHlClient);
|
||||
SQBool results = v_Script_CreateClientVM(hlclient);
|
||||
if (results)
|
||||
DevMsg(eDLL_T::CLIENT, "Created CLIENT VM: '%p'\n", Script_GetContextObject(SQCONTEXT::CLIENT));
|
||||
else
|
||||
@ -252,31 +252,31 @@ SQBool Script_DestroySignalEntryListHead(CSquirrelVM* s, HSQUIRRELVM v, SQFloat
|
||||
// Purpose: prints the global include file the compiler loads for loading scripts
|
||||
// Input : *szRsonName -
|
||||
//---------------------------------------------------------------------------------
|
||||
SQInteger Script_LoadRson(const SQChar* szRsonName)
|
||||
SQInteger Script_LoadRson(const SQChar* rsonfile)
|
||||
{
|
||||
if (sq_showrsonloading->GetBool())
|
||||
{
|
||||
DevMsg(eDLL_T::ENGINE, "Loading RSON: '%s'\n", szRsonName);
|
||||
DevMsg(eDLL_T::ENGINE, "Loading RSON: '%s'\n", rsonfile);
|
||||
}
|
||||
return v_Script_LoadRson(szRsonName);
|
||||
return v_Script_LoadRson(rsonfile);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
// Purpose: prints the scripts the compiler loads from global include to be compiled
|
||||
// Input : *v -
|
||||
// *szScriptPath -
|
||||
// *szScriptName -
|
||||
// nFlag -
|
||||
// *path -
|
||||
// *name -
|
||||
// flags -
|
||||
//---------------------------------------------------------------------------------
|
||||
SQBool Script_LoadScript(HSQUIRRELVM v, const SQChar* szScriptPath, const SQChar* szScriptName, SQInteger nFlag)
|
||||
SQBool Script_LoadScript(HSQUIRRELVM v, const SQChar* path, const SQChar* name, SQInteger flags)
|
||||
{
|
||||
if (sq_showscriptloading->GetBool())
|
||||
{
|
||||
DevMsg(eDLL_T::ENGINE, "Loading script: '%s'\n", szScriptName);
|
||||
DevMsg(eDLL_T::ENGINE, "Loading script: '%s'\n", name);
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
return v_Script_LoadScript(v, szScriptPath, szScriptName, nFlag);
|
||||
return v_Script_LoadScript(v, path, name, flags);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------------
|
||||
@ -297,14 +297,14 @@ void Script_Execute(const SQChar* code, const SQCONTEXT context)
|
||||
return; // Only run in main thread.
|
||||
}
|
||||
|
||||
CSquirrelVM* script = Script_GetContextObject(context);
|
||||
if (!script)
|
||||
CSquirrelVM* s = Script_GetContextObject(context);
|
||||
if (!s)
|
||||
{
|
||||
Error(eDLL_T::ENGINE, NO_ERROR, "Attempted to run %s script with no handle to VM\n", SQVM_GetContextName(context));
|
||||
return;
|
||||
}
|
||||
|
||||
HSQUIRRELVM v = script->GetVM();
|
||||
HSQUIRRELVM v = s->GetVM();
|
||||
if (!v)
|
||||
{
|
||||
Error(eDLL_T::ENGINE, NO_ERROR, "Attempted to run %s script while VM isn't initialized\n", SQVM_GetContextName(context));
|
||||
|
||||
@ -4,28 +4,28 @@
|
||||
|
||||
struct ScriptFunctionBinding_t
|
||||
{
|
||||
const SQChar* m_szScriptName; // 00
|
||||
const SQChar* m_szNativeName; // 08
|
||||
const SQChar* m_szHelpString; // 10
|
||||
const SQChar* m_szRetValType; // 18
|
||||
const SQChar* m_szArgTypes; // 20
|
||||
std::int16_t unk28; // 28
|
||||
std::int16_t padding1; // 2A
|
||||
std::int32_t unk2c; // 2C
|
||||
std::int64_t unk30; // 30
|
||||
std::int32_t unk38; // 38
|
||||
std::int32_t padding2; // 3C
|
||||
std::int64_t unk40; // 40
|
||||
std::int64_t unk48; // 48
|
||||
std::int64_t unk50; // 50
|
||||
std::int32_t unk58; // 58
|
||||
std::int32_t padding3; // 5C
|
||||
void* m_pFunction; // 60
|
||||
const SQChar* _scriptname; // 00
|
||||
const SQChar* _nativename; // 08
|
||||
const SQChar* _helpstring; // 10
|
||||
const SQChar* _returntype; // 18
|
||||
const SQChar* _parameters; // 20
|
||||
std::int16_t unk28; // 28
|
||||
std::int16_t padding1; // 2A
|
||||
std::int32_t unk2c; // 2C
|
||||
std::int64_t unk30; // 30
|
||||
std::int32_t unk38; // 38
|
||||
SQInteger _nparamscheck; // 3C
|
||||
std::int64_t unk40; // 40
|
||||
std::int64_t unk48; // 48
|
||||
std::int64_t unk50; // 50
|
||||
std::int32_t unk58; // 58
|
||||
std::int32_t padding3; // 5C
|
||||
void* _functor; // 60
|
||||
|
||||
ScriptFunctionBinding_t()
|
||||
{
|
||||
memset(this, '\0', sizeof(ScriptFunctionBinding_t));
|
||||
this->padding2 = 6;
|
||||
this->_nparamscheck = 6;
|
||||
}
|
||||
};
|
||||
|
||||
@ -59,10 +59,10 @@ private:
|
||||
#pragma pack(pop)
|
||||
|
||||
inline CMemory p_Script_RegisterFunction;
|
||||
inline auto v_Script_RegisterFunction = p_Script_RegisterFunction.RCast<SQRESULT(*)(CSquirrelVM* pSquirrelVM, ScriptFunctionBinding_t* sqFunc, SQInteger a1)>();
|
||||
inline auto v_Script_RegisterFunction = p_Script_RegisterFunction.RCast<SQRESULT(*)(CSquirrelVM* s, ScriptFunctionBinding_t* binding, SQInteger a1)>();
|
||||
|
||||
inline CMemory p_Script_RegisterConstant;
|
||||
inline auto v_Script_RegisterConstant = p_Script_RegisterConstant.RCast<SQRESULT(*)(CSquirrelVM* pSquirrelVM, const SQChar* name, SQInteger val)>();
|
||||
inline auto v_Script_RegisterConstant = p_Script_RegisterConstant.RCast<SQRESULT(*)(CSquirrelVM* s, const SQChar* name, SQInteger value)>();
|
||||
#if !defined (CLIENT_DLL)
|
||||
inline CMemory p_Script_InitializeSVGlobalStructs;
|
||||
inline auto v_Script_InitializeSVGlobalStructs = p_Script_InitializeSVGlobalStructs.RCast<SQRESULT(*)(HSQUIRRELVM v)>();
|
||||
@ -80,10 +80,10 @@ inline auto v_Script_CreateServerVM = p_Script_CreateServerVM.RCast<SQBool(*)(vo
|
||||
#endif
|
||||
#if !defined (DEDICATED) && defined (GAMEDLL_S0) || defined (GAMEDLL_S1) || defined (GAMEDLL_S2)
|
||||
inline CMemory p_Script_CreateClientVM;
|
||||
inline auto v_Script_CreateClientVM = p_Script_CreateClientVM.RCast<SQBool(*)(CHLClient* pClient)>();
|
||||
inline auto v_Script_CreateClientVM = p_Script_CreateClientVM.RCast<SQBool(*)(CHLClient* hlclient)>();
|
||||
#elif !defined (DEDICATED) && defined (GAMEDLL_S3)
|
||||
inline CMemory p_Script_CreateClientVM;
|
||||
inline auto v_Script_CreateClientVM = p_Script_CreateClientVM.RCast<SQBool(*)(CHLClient* pClient)>();
|
||||
inline auto v_Script_CreateClientVM = p_Script_CreateClientVM.RCast<SQBool(*)(CHLClient* hlclient)>();
|
||||
#endif
|
||||
#if !defined (DEDICATED)
|
||||
inline CMemory p_Script_CreateUIVM;
|
||||
@ -93,10 +93,10 @@ inline CMemory p_Script_DestroySignalEntryListHead;
|
||||
inline auto v_Script_DestroySignalEntryListHead = p_Script_DestroySignalEntryListHead.RCast<SQBool(*)(CSquirrelVM* s, HSQUIRRELVM v, SQFloat f)>();
|
||||
|
||||
inline CMemory p_Script_LoadRson;
|
||||
inline auto v_Script_LoadRson = p_Script_LoadRson.RCast<SQInteger(*)(const SQChar* szRsonName)>();
|
||||
inline auto v_Script_LoadRson = p_Script_LoadRson.RCast<SQInteger(*)(const SQChar* rsonfile)>();
|
||||
|
||||
inline CMemory p_Script_LoadScript;
|
||||
inline auto v_Script_LoadScript = p_Script_LoadScript.RCast<SQBool(*)(HSQUIRRELVM v, const SQChar* szScriptPath, const SQChar* szScriptName, SQInteger nFlag)>();
|
||||
inline auto v_Script_LoadScript = p_Script_LoadScript.RCast<SQBool(*)(HSQUIRRELVM v, const SQChar* path, const SQChar* name, SQInteger flags)>();
|
||||
|
||||
#if !defined (CLIENT_DLL)
|
||||
inline CMemory g_pServerScript;
|
||||
@ -106,12 +106,12 @@ inline CMemory g_pClientScript;
|
||||
inline CMemory g_pUIScript;
|
||||
#endif // !DEDICATED
|
||||
|
||||
SQRESULT Script_RegisterConstant(CSquirrelVM* pSquirrelVM, const SQChar* name, SQInteger val);
|
||||
SQRESULT Script_RegisterFunction(CSquirrelVM* pSquirrelVM, const SQChar* szScriptName, const SQChar* szNativeName,
|
||||
const SQChar* szHelpString, const SQChar* szRetValType, const SQChar* szArgTypes, void* pFunction);
|
||||
void Script_RegisterServerFunctions(CSquirrelVM* pSquirrelVM);
|
||||
void Script_RegisterClientFunctions(CSquirrelVM* pSquirrelVM);
|
||||
void Script_RegisterUIFunctions(CSquirrelVM* pSquirrelVM);
|
||||
SQRESULT Script_RegisterConstant(CSquirrelVM* s, const SQChar* name, SQInteger value);
|
||||
SQRESULT Script_RegisterFunction(CSquirrelVM* s, const SQChar* scriptname, const SQChar* nativename,
|
||||
const SQChar* helpstring, const SQChar* returntype, const SQChar* arguments, void* functor);
|
||||
void Script_RegisterServerFunctions(CSquirrelVM* s);
|
||||
void Script_RegisterClientFunctions(CSquirrelVM* s);
|
||||
void Script_RegisterUIFunctions(CSquirrelVM* s);
|
||||
|
||||
SQRESULT Script_InitializeCLGlobalStructs(HSQUIRRELVM v, SQCONTEXT context);
|
||||
void Script_InitializeSVGlobalStructs(HSQUIRRELVM v);
|
||||
@ -123,8 +123,8 @@ SQBool Script_CreateClientVM(CHLClient* hlclient);
|
||||
SQBool Script_CreateUIVM();
|
||||
CSquirrelVM* Script_GetContextObject(const SQCONTEXT context);
|
||||
|
||||
SQInteger Script_LoadRson(const SQChar* szRsonName);
|
||||
SQBool Script_LoadScript(HSQUIRRELVM v, const SQChar* szScriptPath, const SQChar* szScriptName, SQInteger nFlag);
|
||||
SQInteger Script_LoadRson(const SQChar* rsonfile);
|
||||
SQBool Script_LoadScript(HSQUIRRELVM v, const SQChar* path, const SQChar* name, SQInteger flags);
|
||||
|
||||
void Script_Execute(const SQChar* code, const SQCONTEXT context);
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user