diff options
| author | Maya <malte.hoermeyer@web.de> | 2022-08-23 03:54:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-23 02:54:54 +0100 |
| commit | 4f6f182d26094b7b7512d656b5085f80e8af3dc9 (patch) | |
| tree | 0a30acbb9c3f47f67887834620e5c182b7b46e09 /NorthstarDLL/scriptservertoclientstringcommand.cpp | |
| parent | 86ea43ef2c32104f92e12c80231ff9271ebeb6e2 (diff) | |
| download | NorthstarLauncher-4f6f182d26094b7b7512d656b5085f80e8af3dc9.tar.gz NorthstarLauncher-4f6f182d26094b7b7512d656b5085f80e8af3dc9.zip | |
Add ability to load Datatables from files (#238)
* first version of kinda working custom datatables
* Fix copy error
* Finish custom datatables
* Fix Merge
* Fix line endings
* Add fallback to rpak when ns_prefere_datatable_from_disk is true
* fix typo
* Bug fixess
* Fix Function Registration hook
* Set convar value
* Fix Client and Ui VM
* enable server auth with ms agian
* Add Filters
* FIx unused import
* Merge remote-tracking branch 'upsteam/bobs-big-refactor-pr' into datatables
Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>
Diffstat (limited to 'NorthstarDLL/scriptservertoclientstringcommand.cpp')
| -rw-r--r-- | NorthstarDLL/scriptservertoclientstringcommand.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/NorthstarDLL/scriptservertoclientstringcommand.cpp b/NorthstarDLL/scriptservertoclientstringcommand.cpp index bc6a1cdc..555ea7cf 100644 --- a/NorthstarDLL/scriptservertoclientstringcommand.cpp +++ b/NorthstarDLL/scriptservertoclientstringcommand.cpp @@ -5,11 +5,11 @@ void ConCommand_ns_script_servertoclientstringcommand(const CCommand& arg) { - if (g_pSquirrel<ScriptContext::CLIENT>->sqvm && + if (g_pSquirrel<ScriptContext::CLIENT>->SquirrelVM && g_pSquirrel<ScriptContext::CLIENT>->setupfunc("NSClientCodeCallback_RecievedServerToClientStringCommand") != SQRESULT_ERROR) { - g_pSquirrel<ScriptContext::CLIENT>->pushstring(g_pSquirrel<ScriptContext::CLIENT>->sqvm2, arg.ArgS()); - g_pSquirrel<ScriptContext::CLIENT>->call(g_pSquirrel<ScriptContext::CLIENT>->sqvm2, 1); // todo: doesn't throw or log errors from within this, probably not great behaviour + g_pSquirrel<ScriptContext::CLIENT>->pushstring(g_pSquirrel<ScriptContext::CLIENT>->sqvm, arg.ArgS()); + g_pSquirrel<ScriptContext::CLIENT>->call(g_pSquirrel<ScriptContext::CLIENT>->sqvm, 1); // todo: doesn't throw or log errors from within this, probably not great behaviour } } |