Folder restructuring from primedev (#624)v1.21.2-rc3v1.21.2

Copies of over the primedev folder structure for easier cherry-picking of further changes

Co-authored-by: F1F7Y <filip.bartos07@proton.me>

3 files changed, 0 insertions, 210 deletions

diff --git a/NorthstarDLL/scripts/server/miscserverfixes.cpp b/NorthstarDLL/scripts/server/miscserverfixes.cpp
deleted file mode 100644
index 48c2c111..00000000
--- a/NorthstarDLL/scripts/server/miscserverfixes.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-ON_DLL_LOAD("server.dll", MiscServerFixes, (CModule module))
-{
-	// nop out call to VGUI shutdown since it crashes the game when quitting from the console
-	module.Offset(0x154A96).NOP(5);
-}
diff --git a/NorthstarDLL/scripts/server/miscserverscript.cpp b/NorthstarDLL/scripts/server/miscserverscript.cpp
deleted file mode 100644
index ed6e4800..00000000
--- a/NorthstarDLL/scripts/server/miscserverscript.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-#include "squirrel/squirrel.h"
-#include "masterserver/masterserver.h"
-#include "server/auth/serverauthentication.h"
-#include "dedicated/dedicated.h"
-#include "client/r2client.h"
-#include "server/r2server.h"
-
-#include <filesystem>
-
-ADD_SQFUNC("void", NSEarlyWritePlayerPersistenceForLeave, "entity player", "", ScriptContext::SERVER)
-{
-	const CBasePlayer* pPlayer = g_pSquirrel<context>->template getentity<CBasePlayer>(sqvm, 1);
-	if (!pPlayer)
-	{
-		spdlog::warn("NSEarlyWritePlayerPersistenceForLeave got null player");
-
-		g_pSquirrel<context>->pushbool(sqvm, false);
-		return SQRESULT_NOTNULL;
-	}
-
-	CBaseClient* pClient = &g_pClientArray[pPlayer->m_nPlayerIndex - 1];
-	if (g_pServerAuthentication->m_PlayerAuthenticationData.find(pClient) == g_pServerAuthentication->m_PlayerAuthenticationData.end())
-	{
-		g_pSquirrel<context>->pushbool(sqvm, false);
-		return SQRESULT_NOTNULL;
-	}
-
-	g_pServerAuthentication->m_PlayerAuthenticationData[pClient].needPersistenceWriteOnLeave = false;
-	g_pServerAuthentication->WritePersistentData(pClient);
-	return SQRESULT_NULL;
-}
-
-ADD_SQFUNC("bool", NSIsWritingPlayerPersistence, "", "", ScriptContext::SERVER)
-{
-	g_pSquirrel<context>->pushbool(sqvm, g_pMasterServerManager->m_bSavingPersistentData);
-	return SQRESULT_NOTNULL;
-}
-
-ADD_SQFUNC("bool", NSIsPlayerLocalPlayer, "entity player", "", ScriptContext::SERVER)
-{
-	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<CBasePlayer>(sqvm, 1);
-	if (!pPlayer)
-	{
-		spdlog::warn("NSIsPlayerLocalPlayer got null player");
-
-		g_pSquirrel<context>->pushbool(sqvm, false);
-		return SQRESULT_NOTNULL;
-	}
-
-	CBaseClient* pClient = &g_pClientArray[pPlayer->m_nPlayerIndex - 1];
-	g_pSquirrel<context>->pushbool(sqvm, !strcmp(g_pLocalPlayerUserID, pClient->m_UID));
-	return SQRESULT_NOTNULL;
-}
-
-ADD_SQFUNC("bool", NSIsDedicated, "", "", ScriptContext::SERVER)
-{
-	g_pSquirrel<context>->pushbool(sqvm, IsDedicatedServer());
-	return SQRESULT_NOTNULL;
-}
-
-ADD_SQFUNC(
-	"bool",
-	NSDisconnectPlayer,
-	"entity player, string reason",
-	"Disconnects the player from the server with the given reason",
-	ScriptContext::SERVER)
-{
-	const CBasePlayer* pPlayer = g_pSquirrel<context>->template getentity<CBasePlayer>(sqvm, 1);
-	const char* reason = g_pSquirrel<context>->getstring(sqvm, 2);
-
-	if (!pPlayer)
-	{
-		spdlog::warn("Attempted to call NSDisconnectPlayer() with null player.");
-
-		g_pSquirrel<context>->pushbool(sqvm, false);
-		return SQRESULT_NOTNULL;
-	}
-
-	// Shouldn't happen but I like sanity checks.
-	CBaseClient* pClient = &g_pClientArray[pPlayer->m_nPlayerIndex - 1];
-	if (!pClient)
-	{
-		spdlog::warn("NSDisconnectPlayer(): player entity has null CBaseClient!");
-
-		g_pSquirrel<context>->pushbool(sqvm, false);
-		return SQRESULT_NOTNULL;
-	}
-
-	if (reason)
-	{
-		CBaseClient__Disconnect(pClient, 1, reason);
-	}
-	else
-	{
-		CBaseClient__Disconnect(pClient, 1, "Disconnected by the server.");
-	}
-
-	g_pSquirrel<context>->pushbool(sqvm, true);
-	return SQRESULT_NOTNULL;
-}
diff --git a/NorthstarDLL/scripts/server/scriptuserinfo.cpp b/NorthstarDLL/scripts/server/scriptuserinfo.cpp
deleted file mode 100644
index c53a9d22..00000000
--- a/NorthstarDLL/scripts/server/scriptuserinfo.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-#include "squirrel/squirrel.h"
-#include "engine/r2engine.h"
-#include "server/r2server.h"
-
-// clang-format off
-ADD_SQFUNC("string", GetUserInfoKVString_Internal, "entity player, string key, string defaultValue = \"\"",
-	"Gets the string value of a given player's userinfo convar by name", ScriptContext::SERVER)
-// clang-format on
-{
-	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<CBasePlayer>(sqvm, 1);
-	if (!pPlayer)
-	{
-		g_pSquirrel<ScriptContext::SERVER>->raiseerror(sqvm, "player is null");
-		return SQRESULT_ERROR;
-	}
-
-	const char* pKey = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 2);
-	const char* pDefaultValue = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 3);
-
-	const char* pResult = g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetString(pKey, pDefaultValue);
-	g_pSquirrel<ScriptContext::SERVER>->pushstring(sqvm, pResult);
-	return SQRESULT_NOTNULL;
-}
-
-// clang-format off
-ADD_SQFUNC("asset", GetUserInfoKVAsset_Internal, "entity player, string key, asset defaultValue = $\"\"",
-	"Gets the asset value of a given player's userinfo convar by name", ScriptContext::SERVER)
-// clang-format on
-{
-	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<CBasePlayer>(sqvm, 1);
-	if (!pPlayer)
-	{
-		g_pSquirrel<ScriptContext::SERVER>->raiseerror(sqvm, "player is null");
-		return SQRESULT_ERROR;
-	}
-
-	const char* pKey = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 2);
-	const char* pDefaultValue;
-	g_pSquirrel<ScriptContext::SERVER>->getasset(sqvm, 3, &pDefaultValue);
-
-	const char* pResult = g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetString(pKey, pDefaultValue);
-	g_pSquirrel<ScriptContext::SERVER>->pushasset(sqvm, pResult);
-	return SQRESULT_NOTNULL;
-}
-
-// clang-format off
-ADD_SQFUNC("int", GetUserInfoKVInt_Internal, "entity player, string key, int defaultValue = 0",
-	"Gets the int value of a given player's userinfo convar by name", ScriptContext::SERVER)
-// clang-format on
-{
-	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<CBasePlayer>(sqvm, 1);
-	if (!pPlayer)
-	{
-		g_pSquirrel<ScriptContext::SERVER>->raiseerror(sqvm, "player is null");
-		return SQRESULT_ERROR;
-	}
-
-	const char* pKey = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 2);
-	const int iDefaultValue = g_pSquirrel<ScriptContext::SERVER>->getinteger(sqvm, 3);
-
-	const int iResult = g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetInt(pKey, iDefaultValue);
-	g_pSquirrel<ScriptContext::SERVER>->pushinteger(sqvm, iResult);
-	return SQRESULT_NOTNULL;
-}
-
-// clang-format off
-ADD_SQFUNC("float", GetUserInfoKVFloat_Internal, "entity player, string key, float defaultValue = 0",
-	"Gets the float value of a given player's userinfo convar by name", ScriptContext::SERVER)
-// clang-format on
-{
-	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->getentity<CBasePlayer>(sqvm, 1);
-	if (!pPlayer)
-	{
-		g_pSquirrel<ScriptContext::SERVER>->raiseerror(sqvm, "player is null");
-		return SQRESULT_ERROR;
-	}
-
-	const char* pKey = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 2);
-	const float flDefaultValue = g_pSquirrel<ScriptContext::SERVER>->getfloat(sqvm, 3);
-
-	const float flResult = g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetFloat(pKey, flDefaultValue);
-	g_pSquirrel<ScriptContext::SERVER>->pushfloat(sqvm, flResult);
-	return SQRESULT_NOTNULL;
-}
-
-// clang-format off
-ADD_SQFUNC("bool", GetUserInfoKVBool_Internal, "entity player, string key, bool defaultValue = false",
-	"Gets the bool value of a given player's userinfo convar by name", ScriptContext::SERVER)
-// clang-format on
-{
-	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->getentity<CBasePlayer>(sqvm, 1);
-	if (!pPlayer)
-	{
-		g_pSquirrel<ScriptContext::SERVER>->raiseerror(sqvm, "player is null");
-		return SQRESULT_ERROR;
-	}
-
-	const char* pKey = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 2);
-	const bool bDefaultValue = g_pSquirrel<ScriptContext::SERVER>->getbool(sqvm, 3);
-
-	const bool bResult = g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetInt(pKey, bDefaultValue);
-	g_pSquirrel<ScriptContext::SERVER>->pushbool(sqvm, bResult);
-	return SQRESULT_NOTNULL;
-}