aboutsummaryrefslogtreecommitdiff
path: root/NorthstarDLL/scripts
diff options
context:
space:
mode:
authorJack <66967891+ASpoonPlaysGames@users.noreply.github.com>2023-10-07 11:25:09 +0100
committerGitHub <noreply@github.com>2023-10-07 12:25:09 +0200
commitc093ee10f004f7e2b8be2b326a4b087392ded544 (patch)
tree14db03b2f10549fe368919157906cd6be32e60d3 /NorthstarDLL/scripts
parent9d8bedf580184313f419cdb60351e712712832e3 (diff)
downloadNorthstarLauncher-c093ee10f004f7e2b8be2b326a4b087392ded544.tar.gz
NorthstarLauncher-c093ee10f004f7e2b8be2b326a4b087392ded544.zip
Expose origin auth state and errors to squirrel (#468)
Also moves `NSIsMasterServerAuthenticated` out of `scriptserverbrowser.cpp` because it didn't really fit there This will be used for showing failed origin auth errors in the game's UI
Diffstat (limited to 'NorthstarDLL/scripts')
-rw-r--r--NorthstarDLL/scripts/client/scriptoriginauth.cpp35
-rw-r--r--NorthstarDLL/scripts/client/scriptserverbrowser.cpp6
2 files changed, 35 insertions, 6 deletions
diff --git a/NorthstarDLL/scripts/client/scriptoriginauth.cpp b/NorthstarDLL/scripts/client/scriptoriginauth.cpp
new file mode 100644
index 00000000..420c4872
--- /dev/null
+++ b/NorthstarDLL/scripts/client/scriptoriginauth.cpp
@@ -0,0 +1,35 @@
+#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
index ff6da6e2..1945b3dc 100644
--- a/NorthstarDLL/scripts/client/scriptserverbrowser.cpp
+++ b/NorthstarDLL/scripts/client/scriptserverbrowser.cpp
@@ -6,12 +6,6 @@
// functions for viewing server browser
-ADD_SQFUNC("bool", NSIsMasterServerAuthenticated, "", "", ScriptContext::UI)
-{
- g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bOriginAuthWithMasterServerDone);
- return SQRESULT_NOTNULL;
-}
-
ADD_SQFUNC("void", NSRequestServerList, "", "", ScriptContext::UI)
{
g_pMasterServerManager->RequestServerList();