aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDLL/scripts/client
diff options
context:
space:
mode:
Diffstat (limited to 'NorthstarDLL/scripts/client')
-rw-r--r--NorthstarDLL/scripts/client/clientchathooks.cpp72
-rw-r--r--NorthstarDLL/scripts/client/cursorposition.cpp22
-rw-r--r--NorthstarDLL/scripts/client/scriptbrowserhooks.cpp24
-rw-r--r--NorthstarDLL/scripts/client/scriptmainmenupromos.cpp123
-rw-r--r--NorthstarDLL/scripts/client/scriptmodmenu.cpp165
-rw-r--r--NorthstarDLL/scripts/client/scriptoriginauth.cpp35
-rw-r--r--NorthstarDLL/scripts/client/scriptserverbrowser.cpp209
-rw-r--r--NorthstarDLL/scripts/client/scriptservertoclientstringcommand.cpp18
8 files changed, 0 insertions, 668 deletions
diff --git a/NorthstarDLL/scripts/client/clientchathooks.cpp b/NorthstarDLL/scripts/client/clientchathooks.cpp
deleted file mode 100644
index e084f47e..00000000
--- a/NorthstarDLL/scripts/client/clientchathooks.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-#include "squirrel/squirrel.h"
-#include "util/utils.h"
-
-#include "server/serverchathooks.h"
-#include "client/localchatwriter.h"
-
-#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
-{
- // This hook is called for each HUD, but we only want our logic to run once.
- if (self != *CHudChat::allHuds)
- return;
-
- int senderId = inboxId & CUSTOM_MESSAGE_INDEX_MASK;
- bool isAnonymous = senderId == 0;
- bool isCustom = isAnonymous || (inboxId & CUSTOM_MESSAGE_INDEX_BIT);
-
- // Type is set to 0 for non-custom messages, custom messages have a type encoded as the first byte
- int type = 0;
- const char* payload = message;
- if (isCustom)
- {
- type = message[0];
- payload = message + 1;
- }
-
- RemoveAsciiControlSequences(const_cast<char*>(message), true);
-
- SQRESULT result = g_pSquirrel<ScriptContext::CLIENT>->Call(
- "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);
-}
-
-ADD_SQFUNC("void", NSChatWrite, "int context, string text", "", ScriptContext::CLIENT)
-{
- int chatContext = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 1);
- const char* str = g_pSquirrel<ScriptContext::CLIENT>->getstring(sqvm, 2);
-
- LocalChatWriter((LocalChatWriter::Context)chatContext).Write(str);
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("void", NSChatWriteRaw, "int context, string text", "", ScriptContext::CLIENT)
-{
- int chatContext = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 1);
- const char* str = g_pSquirrel<ScriptContext::CLIENT>->getstring(sqvm, 2);
-
- LocalChatWriter((LocalChatWriter::Context)chatContext).InsertText(str);
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("void", NSChatWriteLine, "int context, string text", "", ScriptContext::CLIENT)
-{
- int chatContext = g_pSquirrel<ScriptContext::CLIENT>->getinteger(sqvm, 1);
- const char* str = g_pSquirrel<ScriptContext::CLIENT>->getstring(sqvm, 2);
-
- LocalChatWriter((LocalChatWriter::Context)chatContext).WriteLine(str);
- return SQRESULT_NULL;
-}
-
-ON_DLL_LOAD_CLIENT("client.dll", ClientChatHooks, (CModule module))
-{
- AUTOHOOK_DISPATCH()
-}
diff --git a/NorthstarDLL/scripts/client/cursorposition.cpp b/NorthstarDLL/scripts/client/cursorposition.cpp
deleted file mode 100644
index c0e8623c..00000000
--- a/NorthstarDLL/scripts/client/cursorposition.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "squirrel/squirrel.h"
-#include "util/wininfo.h"
-
-ADD_SQFUNC("vector ornull", NSGetCursorPosition, "", "", ScriptContext::UI)
-{
- RECT rcClient;
- POINT p;
- if (GetCursorPos(&p) && ScreenToClient(*g_gameHWND, &p) && GetClientRect(*g_gameHWND, &rcClient))
- {
- if (GetAncestor(GetForegroundWindow(), GA_ROOTOWNER) != *g_gameHWND)
- return SQRESULT_NULL;
-
- g_pSquirrel<context>->pushvector(
- sqvm,
- {p.x > 0 ? p.x > rcClient.right ? rcClient.right : (float)p.x : 0,
- p.y > 0 ? p.y > rcClient.bottom ? rcClient.bottom : (float)p.y : 0,
- 0});
- return SQRESULT_NOTNULL;
- }
- g_pSquirrel<context>->raiseerror(sqvm, "Failed retrieving cursor position of game window");
- return SQRESULT_ERROR;
-}
diff --git a/NorthstarDLL/scripts/client/scriptbrowserhooks.cpp b/NorthstarDLL/scripts/client/scriptbrowserhooks.cpp
deleted file mode 100644
index 86b4a356..00000000
--- a/NorthstarDLL/scripts/client/scriptbrowserhooks.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-
-AUTOHOOK_INIT()
-
-bool* bIsOriginOverlayEnabled;
-
-// clang-format off
-AUTOHOOK(OpenExternalWebBrowser, engine.dll + 0x184E40,
-void, __fastcall, (char* pUrl, char flags))
-// clang-format on
-{
- bool bIsOriginOverlayEnabledOriginal = *bIsOriginOverlayEnabled;
- if (flags & 2 && !strncmp(pUrl, "http", 4)) // custom force external browser flag
- *bIsOriginOverlayEnabled = false; // if this bool is false, game will use an external browser rather than the origin overlay one
-
- OpenExternalWebBrowser(pUrl, flags);
- *bIsOriginOverlayEnabled = bIsOriginOverlayEnabledOriginal;
-}
-
-ON_DLL_LOAD_CLIENT("engine.dll", ScriptExternalBrowserHooks, (CModule module))
-{
- AUTOHOOK_DISPATCH()
-
- bIsOriginOverlayEnabled = module.Offset(0x13978255).RCast<bool*>();
-}
diff --git a/NorthstarDLL/scripts/client/scriptmainmenupromos.cpp b/NorthstarDLL/scripts/client/scriptmainmenupromos.cpp
deleted file mode 100644
index ecb47af7..00000000
--- a/NorthstarDLL/scripts/client/scriptmainmenupromos.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-#include "squirrel/squirrel.h"
-#include "masterserver/masterserver.h"
-
-// mirror this in script
-enum eMainMenuPromoDataProperty
-{
- newInfoTitle1,
- newInfoTitle2,
- newInfoTitle3,
-
- largeButtonTitle,
- largeButtonText,
- largeButtonUrl,
- largeButtonImageIndex,
-
- smallButton1Title,
- smallButton1Url,
- smallButton1ImageIndex,
-
- smallButton2Title,
- smallButton2Url,
- smallButton2ImageIndex
-};
-ADD_SQFUNC("void", NSRequestCustomMainMenuPromos, "", "", ScriptContext::UI)
-{
- g_pMasterServerManager->RequestMainMenuPromos();
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("bool", NSHasCustomMainMenuPromoData, "", "", ScriptContext::UI)
-{
- g_pSquirrel<ScriptContext::UI>->pushbool(sqvm, g_pMasterServerManager->m_bHasMainMenuPromoData);
- return SQRESULT_NOTNULL;
-}
-
-ADD_SQFUNC("var", NSGetCustomMainMenuPromoData, "int promoDataKey", "", ScriptContext::UI)
-{
- if (!g_pMasterServerManager->m_bHasMainMenuPromoData)
- return SQRESULT_NULL;
-
- switch (g_pSquirrel<ScriptContext::UI>->getinteger(sqvm, 1))
- {
- case eMainMenuPromoDataProperty::newInfoTitle1:
- {
- g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.newInfoTitle1.c_str());
- break;
- }
-
- case eMainMenuPromoDataProperty::newInfoTitle2:
- {
- g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.newInfoTitle2.c_str());
- break;
- }
-
- case eMainMenuPromoDataProperty::newInfoTitle3:
- {
- g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.newInfoTitle3.c_str());
- break;
- }
-
- case eMainMenuPromoDataProperty::largeButtonTitle:
- {
- g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.largeButtonTitle.c_str());
- break;
- }
-
- case eMainMenuPromoDataProperty::largeButtonText:
- {
- g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.largeButtonText.c_str());
- break;
- }
-
- case eMainMenuPromoDataProperty::largeButtonUrl:
- {
- g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.largeButtonUrl.c_str());
- break;
- }
-
- case eMainMenuPromoDataProperty::largeButtonImageIndex:
- {
- g_pSquirrel<ScriptContext::UI>->pushinteger(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.largeButtonImageIndex);
- break;
- }
-
- case eMainMenuPromoDataProperty::smallButton1Title:
- {
- g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton1Title.c_str());
- break;
- }
-
- case eMainMenuPromoDataProperty::smallButton1Url:
- {
- g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton1Url.c_str());
- break;
- }
-
- case eMainMenuPromoDataProperty::smallButton1ImageIndex:
- {
- g_pSquirrel<ScriptContext::UI>->pushinteger(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton1ImageIndex);
- break;
- }
-
- case eMainMenuPromoDataProperty::smallButton2Title:
- {
- g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton2Title.c_str());
- break;
- }
-
- case eMainMenuPromoDataProperty::smallButton2Url:
- {
- g_pSquirrel<ScriptContext::UI>->pushstring(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton2Url.c_str());
- break;
- }
-
- case eMainMenuPromoDataProperty::smallButton2ImageIndex:
- {
- g_pSquirrel<ScriptContext::UI>->pushinteger(sqvm, g_pMasterServerManager->m_sMainMenuPromoData.smallButton2ImageIndex);
- break;
- }
- }
-
- return SQRESULT_NOTNULL;
-}
diff --git a/NorthstarDLL/scripts/client/scriptmodmenu.cpp b/NorthstarDLL/scripts/client/scriptmodmenu.cpp
deleted file mode 100644
index a88478fb..00000000
--- a/NorthstarDLL/scripts/client/scriptmodmenu.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-#include "mods/modmanager.h"
-#include "squirrel/squirrel.h"
-
-ADD_SQFUNC("array<string>", NSGetModNames, "", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
-{
- g_pSquirrel<context>->newarray(sqvm, 0);
-
- for (Mod& mod : g_pModManager->m_LoadedMods)
- {
- g_pSquirrel<context>->pushstring(sqvm, mod.Name.c_str());
- g_pSquirrel<context>->arrayappend(sqvm, -2);
- }
-
- return SQRESULT_NOTNULL;
-}
-
-ADD_SQFUNC("bool", NSIsModEnabled, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
-{
- const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
-
- // manual lookup, not super performant but eh not a big deal
- for (Mod& mod : g_pModManager->m_LoadedMods)
- {
- if (!mod.Name.compare(modName))
- {
- g_pSquirrel<context>->pushbool(sqvm, mod.m_bEnabled);
- return SQRESULT_NOTNULL;
- }
- }
-
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("void", NSSetModEnabled, "string modName, bool enabled", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
-{
- const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
- const SQBool enabled = g_pSquirrel<context>->getbool(sqvm, 2);
-
- // manual lookup, not super performant but eh not a big deal
- for (Mod& mod : g_pModManager->m_LoadedMods)
- {
- if (!mod.Name.compare(modName))
- {
- mod.m_bEnabled = enabled;
- return SQRESULT_NULL;
- }
- }
-
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("string", NSGetModDescriptionByModName, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
-{
- const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
-
- // manual lookup, not super performant but eh not a big deal
- for (Mod& mod : g_pModManager->m_LoadedMods)
- {
- if (!mod.Name.compare(modName))
- {
- g_pSquirrel<context>->pushstring(sqvm, mod.Description.c_str());
- return SQRESULT_NOTNULL;
- }
- }
-
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("string", NSGetModVersionByModName, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
-{
- const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
-
- // manual lookup, not super performant but eh not a big deal
- for (Mod& mod : g_pModManager->m_LoadedMods)
- {
- if (!mod.Name.compare(modName))
- {
- g_pSquirrel<context>->pushstring(sqvm, mod.Version.c_str());
- return SQRESULT_NOTNULL;
- }
- }
-
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("string", NSGetModDownloadLinkByModName, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
-{
- const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
-
- // manual lookup, not super performant but eh not a big deal
- for (Mod& mod : g_pModManager->m_LoadedMods)
- {
- if (!mod.Name.compare(modName))
- {
- g_pSquirrel<context>->pushstring(sqvm, mod.DownloadLink.c_str());
- return SQRESULT_NOTNULL;
- }
- }
-
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("int", NSGetModLoadPriority, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
-{
- const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
-
- // manual lookup, not super performant but eh not a big deal
- for (Mod& mod : g_pModManager->m_LoadedMods)
- {
- if (!mod.Name.compare(modName))
- {
- g_pSquirrel<context>->pushinteger(sqvm, mod.LoadPriority);
- return SQRESULT_NOTNULL;
- }
- }
-
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("bool", NSIsModRequiredOnClient, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
-{
- const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
-
- // manual lookup, not super performant but eh not a big deal
- for (Mod& mod : g_pModManager->m_LoadedMods)
- {
- if (!mod.Name.compare(modName))
- {
- g_pSquirrel<context>->pushbool(sqvm, mod.RequiredOnClient);
- return SQRESULT_NOTNULL;
- }
- }
-
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC(
- "array<string>", NSGetModConvarsByModName, "string modName", "", ScriptContext::SERVER | ScriptContext::CLIENT | ScriptContext::UI)
-{
- const SQChar* modName = g_pSquirrel<context>->getstring(sqvm, 1);
- g_pSquirrel<context>->newarray(sqvm, 0);
-
- // manual lookup, not super performant but eh not a big deal
- for (Mod& mod : g_pModManager->m_LoadedMods)
- {
- if (!mod.Name.compare(modName))
- {
- for (ModConVar* cvar : mod.ConVars)
- {
- g_pSquirrel<context>->pushstring(sqvm, cvar->Name.c_str());
- g_pSquirrel<context>->arrayappend(sqvm, -2);
- }
-
- return SQRESULT_NOTNULL;
- }
- }
-
- return SQRESULT_NOTNULL; // return empty array
-}
-
-ADD_SQFUNC("void", NSReloadMods, "", "", ScriptContext::UI)
-{
- g_pModManager->LoadMods();
- return SQRESULT_NULL;
-}
diff --git a/NorthstarDLL/scripts/client/scriptoriginauth.cpp b/NorthstarDLL/scripts/client/scriptoriginauth.cpp
deleted file mode 100644
index 420c4872..00000000
--- a/NorthstarDLL/scripts/client/scriptoriginauth.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "squirrel/squirrel.h"
-#include "masterserver/masterserver.h"
-#include "engine/r2engine.h"
-#include "client/r2client.h"
-
-ADD_SQFUNC("bool", NSIsMasterServerAuthenticated, "", "", ScriptContext::UI)
-{
- g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bOriginAuthWithMasterServerDone);
- return SQRESULT_NOTNULL;
-}
-
-/*
-global struct MasterServerAuthResult
-{
- bool success
- string errorCode
- string errorMessage
-}
-*/
-
-ADD_SQFUNC("MasterServerAuthResult", NSGetMasterServerAuthResult, "", "", ScriptContext::UI)
-{
- g_pSquirrel<context>->pushnewstructinstance(sqvm, 3);
-
- g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bOriginAuthWithMasterServerSuccessful);
- g_pSquirrel<context>->sealstructslot(sqvm, 0);
-
- g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_sOriginAuthWithMasterServerErrorCode.c_str(), -1);
- g_pSquirrel<context>->sealstructslot(sqvm, 1);
-
- g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_sOriginAuthWithMasterServerErrorMessage.c_str(), -1);
- g_pSquirrel<context>->sealstructslot(sqvm, 2);
-
- return SQRESULT_NOTNULL;
-}
diff --git a/NorthstarDLL/scripts/client/scriptserverbrowser.cpp b/NorthstarDLL/scripts/client/scriptserverbrowser.cpp
deleted file mode 100644
index a142c3f4..00000000
--- a/NorthstarDLL/scripts/client/scriptserverbrowser.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-#include "squirrel/squirrel.h"
-#include "masterserver/masterserver.h"
-#include "server/auth/serverauthentication.h"
-#include "engine/r2engine.h"
-#include "client/r2client.h"
-
-// functions for viewing server browser
-
-ADD_SQFUNC("void", NSRequestServerList, "", "", ScriptContext::UI)
-{
- g_pMasterServerManager->RequestServerList();
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("bool", NSIsRequestingServerList, "", "", ScriptContext::UI)
-{
- g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bScriptRequestingServerList);
- return SQRESULT_NOTNULL;
-}
-
-ADD_SQFUNC("bool", NSMasterServerConnectionSuccessful, "", "", ScriptContext::UI)
-{
- g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bSuccessfullyConnected);
- return SQRESULT_NOTNULL;
-}
-
-ADD_SQFUNC("int", NSGetServerCount, "", "", ScriptContext::UI)
-{
- g_pSquirrel<context>->pushinteger(sqvm, g_pMasterServerManager->m_vRemoteServers.size());
- return SQRESULT_NOTNULL;
-}
-
-ADD_SQFUNC("void", NSClearRecievedServerList, "", "", ScriptContext::UI)
-{
- g_pMasterServerManager->ClearServerList();
- return SQRESULT_NULL;
-}
-
-// functions for authenticating with servers
-
-ADD_SQFUNC("void", NSTryAuthWithServer, "int serverIndex, string password = ''", "", ScriptContext::UI)
-{
- SQInteger serverIndex = g_pSquirrel<context>->getinteger(sqvm, 1);
- const SQChar* password = g_pSquirrel<context>->getstring(sqvm, 2);
-
- if (serverIndex >= g_pMasterServerManager->m_vRemoteServers.size())
- {
- g_pSquirrel<context>->raiseerror(
- sqvm,
- fmt::format(
- "Tried to auth with server index {} when only {} servers are available",
- serverIndex,
- g_pMasterServerManager->m_vRemoteServers.size())
- .c_str());
- return SQRESULT_ERROR;
- }
-
- // send off persistent data first, don't worry about server/client stuff, since m_additionalPlayerData should only have entries when
- // we're a local server note: this seems like it could create a race condition, test later
- for (auto& pair : g_pServerAuthentication->m_PlayerAuthenticationData)
- g_pServerAuthentication->WritePersistentData(pair.first);
-
- // do auth
- g_pMasterServerManager->AuthenticateWithServer(
- g_pLocalPlayerUserID,
- g_pMasterServerManager->m_sOwnClientAuthToken,
- g_pMasterServerManager->m_vRemoteServers[serverIndex],
- (char*)password);
-
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("bool", NSIsAuthenticatingWithServer, "", "", ScriptContext::UI)
-{
- g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bScriptAuthenticatingWithGameServer);
- return SQRESULT_NOTNULL;
-}
-
-ADD_SQFUNC("bool", NSWasAuthSuccessful, "", "", ScriptContext::UI)
-{
- g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bSuccessfullyAuthenticatedWithGameServer);
- return SQRESULT_NOTNULL;
-}
-
-ADD_SQFUNC("void", NSConnectToAuthedServer, "", "", ScriptContext::UI)
-{
- if (!g_pMasterServerManager->m_bHasPendingConnectionInfo)
- {
- g_pSquirrel<context>->raiseerror(
- sqvm, fmt::format("Tried to connect to authed server before any pending connection info was available").c_str());
- return SQRESULT_ERROR;
- }
-
- RemoteServerConnectionInfo& info = g_pMasterServerManager->m_pendingConnectionInfo;
-
- // set auth token, then try to connect
- // i'm honestly not entirely sure how silentconnect works regarding ports and encryption so using connect for now
- g_pCVar->FindVar("serverfilter")->SetValue(info.authToken);
- Cbuf_AddText(
- Cbuf_GetCurrentPlayer(),
- fmt::format(
- "connect {}.{}.{}.{}:{}",
- info.ip.S_un.S_un_b.s_b1,
- info.ip.S_un.S_un_b.s_b2,
- info.ip.S_un.S_un_b.s_b3,
- info.ip.S_un.S_un_b.s_b4,
- info.port)
- .c_str(),
- cmd_source_t::kCommandSrcCode);
-
- g_pMasterServerManager->m_bHasPendingConnectionInfo = false;
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("void", NSTryAuthWithLocalServer, "", "", ScriptContext::UI)
-{
- // do auth request
- g_pMasterServerManager->AuthenticateWithOwnServer(g_pLocalPlayerUserID, g_pMasterServerManager->m_sOwnClientAuthToken);
-
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("void", NSCompleteAuthWithLocalServer, "", "", ScriptContext::UI)
-{
- // literally just set serverfilter
- // note: this assumes we have no authdata other than our own
- if (g_pServerAuthentication->m_RemoteAuthenticationData.size())
- g_pCVar->FindVar("serverfilter")->SetValue(g_pServerAuthentication->m_RemoteAuthenticationData.begin()->first.c_str());
-
- return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("string", NSGetAuthFailReason, "", "", ScriptContext::UI)
-{
- g_pSquirrel<context>->pushstring(sqvm, g_pMasterServerManager->m_sAuthFailureReason.c_str(), -1);
- return SQRESULT_NOTNULL;
-}
-
-ADD_SQFUNC("array<ServerInfo>", NSGetGameServers, "", "", ScriptContext::UI)
-{
- g_pSquirrel<context>->newarray(sqvm, 0);
- for (size_t i = 0; i < g_pMasterServerManager->m_vRemoteServers.size(); i++)
- {
- const RemoteServerInfo& remoteServer = g_pMasterServerManager->m_vRemoteServers[i];
-
- g_pSquirrel<context>->pushnewstructinstance(sqvm, 11);
-
- // index
- g_pSquirrel<context>->pushinteger(sqvm, i);
- g_pSquirrel<context>->sealstructslot(sqvm, 0);
-
- // id
- g_pSquirrel<context>->pushstring(sqvm, remoteServer.id, -1);
- g_pSquirrel<context>->sealstructslot(sqvm, 1);
-
- // name
- g_pSquirrel<context>->pushstring(sqvm, remoteServer.name, -1);
- g_pSquirrel<context>->sealstructslot(sqvm, 2);
-
- // description
- g_pSquirrel<context>->pushstring(sqvm, remoteServer.description.c_str(), -1);
- g_pSquirrel<context>->sealstructslot(sqvm, 3);
-
- // map
- g_pSquirrel<context>->pushstring(sqvm, remoteServer.map, -1);
- g_pSquirrel<context>->sealstructslot(sqvm, 4);
-
- // playlist
- g_pSquirrel<context>->pushstring(sqvm, remoteServer.playlist, -1);
- g_pSquirrel<context>->sealstructslot(sqvm, 5);
-
- // playerCount
- g_pSquirrel<context>->pushinteger(sqvm, remoteServer.playerCount);
- g_pSquirrel<context>->sealstructslot(sqvm, 6);
-
- // maxPlayerCount
- g_pSquirrel<context>->pushinteger(sqvm, remoteServer.maxPlayers);
- g_pSquirrel<context>->sealstructslot(sqvm, 7);
-
- // requiresPassword
- g_pSquirrel<context>->pushbool(sqvm, remoteServer.requiresPassword);
- g_pSquirrel<context>->sealstructslot(sqvm, 8);
-
- // region
- g_pSquirrel<context>->pushstring(sqvm, remoteServer.region, -1);
- g_pSquirrel<context>->sealstructslot(sqvm, 9);
-
- // requiredMods
- g_pSquirrel<context>->newarray(sqvm);
- for (const RemoteModInfo& mod : remoteServer.requiredMods)
- {
- g_pSquirrel<context>->pushnewstructinstance(sqvm, 2);
-
- // name
- g_pSquirrel<context>->pushstring(sqvm, mod.Name.c_str(), -1);
- g_pSquirrel<context>->sealstructslot(sqvm, 0);
-
- // version
- g_pSquirrel<context>->pushstring(sqvm, mod.Version.c_str(), -1);
- g_pSquirrel<context>->sealstructslot(sqvm, 1);
-
- g_pSquirrel<context>->arrayappend(sqvm, -2);
- }
- g_pSquirrel<context>->sealstructslot(sqvm, 10);
-
- g_pSquirrel<context>->arrayappend(sqvm, -2);
- }
- return SQRESULT_NOTNULL;
-}
diff --git a/NorthstarDLL/scripts/client/scriptservertoclientstringcommand.cpp b/NorthstarDLL/scripts/client/scriptservertoclientstringcommand.cpp
deleted file mode 100644
index a3a81c8a..00000000
--- a/NorthstarDLL/scripts/client/scriptservertoclientstringcommand.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "squirrel/squirrel.h"
-#include "core/convar/convar.h"
-#include "core/convar/concommand.h"
-
-void ConCommand_ns_script_servertoclientstringcommand(const CCommand& arg)
-{
- if (g_pSquirrel<ScriptContext::CLIENT>->m_pSQVM)
- g_pSquirrel<ScriptContext::CLIENT>->Call("NSClientCodeCallback_RecievedServerToClientStringCommand", arg.ArgS());
-}
-
-ON_DLL_LOAD_CLIENT_RELIESON("client.dll", ScriptServerToClientStringCommand, ClientSquirrel, (CModule module))
-{
- RegisterConCommand(
- "ns_script_servertoclientstringcommand",
- ConCommand_ns_script_servertoclientstringcommand,
- "",
- FCVAR_CLIENTDLL | FCVAR_SERVER_CAN_EXECUTE);
-}