Cherry pick "remove unnecessary namespaces" from primedev (#618)v1.21.2-rc2

Cherry-picks the removal of unnecessary namespaces from `primedev`
https://github.com/F1F7Y/NorthstarPrime/

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

7 files changed, 36 insertions, 36 deletions

diff --git a/NorthstarDLL/scripts/client/clientchathooks.cpp b/NorthstarDLL/scripts/client/clientchathooks.cpp
index df9497ef..e084f47e 100644
--- a/NorthstarDLL/scripts/client/clientchathooks.cpp
+++ b/NorthstarDLL/scripts/client/clientchathooks.cpp
@@ -30,7 +30,7 @@ void, __fastcall, (void* self, const char* message, int inboxId, bool isTeam, bo
 		payload = message + 1;
 	}
 
-	NS::Utils::RemoveAsciiControlSequences(const_cast<char*>(message), true);
+	RemoveAsciiControlSequences(const_cast<char*>(message), true);
 
 	SQRESULT result = g_pSquirrel<ScriptContext::CLIENT>->Call(
 		"CHudChat_ProcessMessageStartThread", static_cast<int>(senderId) - 1, payload, isTeam, isDead, type);
diff --git a/NorthstarDLL/scripts/client/scriptserverbrowser.cpp b/NorthstarDLL/scripts/client/scriptserverbrowser.cpp
index 1945b3dc..a142c3f4 100644
--- a/NorthstarDLL/scripts/client/scriptserverbrowser.cpp
+++ b/NorthstarDLL/scripts/client/scriptserverbrowser.cpp
@@ -62,7 +62,7 @@ ADD_SQFUNC("void", NSTryAuthWithServer, "int serverIndex, string password = ''",
 
 	// do auth
 	g_pMasterServerManager->AuthenticateWithServer(
-		R2::g_pLocalPlayerUserID,
+		g_pLocalPlayerUserID,
 		g_pMasterServerManager->m_sOwnClientAuthToken,
 		g_pMasterServerManager->m_vRemoteServers[serverIndex],
 		(char*)password);
@@ -95,9 +95,9 @@ ADD_SQFUNC("void", NSConnectToAuthedServer, "", "", ScriptContext::UI)
 
 	// 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
-	R2::g_pCVar->FindVar("serverfilter")->SetValue(info.authToken);
-	R2::Cbuf_AddText(
-		R2::Cbuf_GetCurrentPlayer(),
+	g_pCVar->FindVar("serverfilter")->SetValue(info.authToken);
+	Cbuf_AddText(
+		Cbuf_GetCurrentPlayer(),
 		fmt::format(
 			"connect {}.{}.{}.{}:{}",
 			info.ip.S_un.S_un_b.s_b1,
@@ -106,7 +106,7 @@ ADD_SQFUNC("void", NSConnectToAuthedServer, "", "", ScriptContext::UI)
 			info.ip.S_un.S_un_b.s_b4,
 			info.port)
 			.c_str(),
-		R2::cmd_source_t::kCommandSrcCode);
+		cmd_source_t::kCommandSrcCode);
 
 	g_pMasterServerManager->m_bHasPendingConnectionInfo = false;
 	return SQRESULT_NULL;
@@ -115,7 +115,7 @@ ADD_SQFUNC("void", NSConnectToAuthedServer, "", "", ScriptContext::UI)
 ADD_SQFUNC("void", NSTryAuthWithLocalServer, "", "", ScriptContext::UI)
 {
 	// do auth request
-	g_pMasterServerManager->AuthenticateWithOwnServer(R2::g_pLocalPlayerUserID, g_pMasterServerManager->m_sOwnClientAuthToken);
+	g_pMasterServerManager->AuthenticateWithOwnServer(g_pLocalPlayerUserID, g_pMasterServerManager->m_sOwnClientAuthToken);
 
 	return SQRESULT_NULL;
 }
@@ -125,7 +125,7 @@ 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())
-		R2::g_pCVar->FindVar("serverfilter")->SetValue(g_pServerAuthentication->m_RemoteAuthenticationData.begin()->first.c_str());
+		g_pCVar->FindVar("serverfilter")->SetValue(g_pServerAuthentication->m_RemoteAuthenticationData.begin()->first.c_str());
 
 	return SQRESULT_NULL;
 }
diff --git a/NorthstarDLL/scripts/scriptdatatables.cpp b/NorthstarDLL/scripts/scriptdatatables.cpp
index 532624f3..87a26dca 100644
--- a/NorthstarDLL/scripts/scriptdatatables.cpp
+++ b/NorthstarDLL/scripts/scriptdatatables.cpp
@@ -132,9 +132,9 @@ REPLACE_SQFUNC(GetDataTable, (ScriptContext::UI | ScriptContext::CLIENT | Script
 			diskAssetPath /= fs::path(pAssetName);
 
 		std::string sDiskAssetPath(diskAssetPath.string());
-		if ((*R2::g_pFilesystem)->m_vtable2->FileExists(&(*R2::g_pFilesystem)->m_vtable2, sDiskAssetPath.c_str(), "GAME"))
+		if ((*g_pFilesystem)->m_vtable2->FileExists(&(*g_pFilesystem)->m_vtable2, sDiskAssetPath.c_str(), "GAME"))
 		{
-			std::string sTableCSV = R2::ReadVPKFile(sDiskAssetPath.c_str());
+			std::string sTableCSV = ReadVPKFile(sDiskAssetPath.c_str());
 			if (!sTableCSV.size())
 			{
 				g_pSquirrel<context>->raiseerror(sqvm, fmt::format("Datatable \"{}\" is empty", pAssetName).c_str());
@@ -793,7 +793,7 @@ void DumpDatatable(const char* pDatatablePath)
 		return;
 	}
 
-	std::string sOutputPath(fmt::format("{}/scripts/datatable/{}.csv", R2::g_pModName, fs::path(pDatatablePath).stem().string()));
+	std::string sOutputPath(fmt::format("{}/scripts/datatable/{}.csv", g_pModName, fs::path(pDatatablePath).stem().string()));
 	std::string sDatatableContents(DataTableToString(pDatatable));
 
 	fs::create_directories(fs::path(sOutputPath).remove_filename());
@@ -900,7 +900,7 @@ ON_DLL_LOAD_RELIESON("engine.dll", SharedScriptDataTables, ConVar, (CModule modu
 {
 	Cvar_ns_prefer_datatable_from_disk = new ConVar(
 		"ns_prefer_datatable_from_disk",
-		IsDedicatedServer() && Tier0::CommandLine()->CheckParm("-nopakdedi") ? "1" : "0",
+		IsDedicatedServer() && CommandLine()->CheckParm("-nopakdedi") ? "1" : "0",
 		FCVAR_NONE,
 		"whether to prefer loading datatables from disk, rather than rpak");
 
diff --git a/NorthstarDLL/scripts/scripthttprequesthandler.cpp b/NorthstarDLL/scripts/scripthttprequesthandler.cpp
index 813bd50e..aa75127a 100644
--- a/NorthstarDLL/scripts/scripthttprequesthandler.cpp
+++ b/NorthstarDLL/scripts/scripthttprequesthandler.cpp
@@ -7,19 +7,19 @@ HttpRequestHandler* g_httpRequestHandler;
 
 bool IsHttpDisabled()
 {
-	const static bool bIsHttpDisabled = Tier0::CommandLine()->FindParm("-disablehttprequests");
+	const static bool bIsHttpDisabled = CommandLine()->FindParm("-disablehttprequests");
 	return bIsHttpDisabled;
 }
 
 bool IsLocalHttpAllowed()
 {
-	const static bool bIsLocalHttpAllowed = Tier0::CommandLine()->FindParm("-allowlocalhttp");
+	const static bool bIsLocalHttpAllowed = CommandLine()->FindParm("-allowlocalhttp");
 	return bIsLocalHttpAllowed;
 }
 
 bool DisableHttpSsl()
 {
-	const static bool bDisableHttpSsl = Tier0::CommandLine()->FindParm("-disablehttpssl");
+	const static bool bDisableHttpSsl = CommandLine()->FindParm("-disablehttpssl");
 	return bDisableHttpSsl;
 }
 
diff --git a/NorthstarDLL/scripts/scriptutility.cpp b/NorthstarDLL/scripts/scriptutility.cpp
index 054836ca..4b92fa02 100644
--- a/NorthstarDLL/scripts/scriptutility.cpp
+++ b/NorthstarDLL/scripts/scriptutility.cpp
@@ -18,9 +18,9 @@ ADD_SQFUNC(
 ADD_SQFUNC(
 	"string", NSGetLocalPlayerUID, "", "Returns the local player's uid.", ScriptContext::UI | ScriptContext::CLIENT | ScriptContext::SERVER)
 {
-	if (R2::g_pLocalPlayerUserID)
+	if (g_pLocalPlayerUserID)
 	{
-		g_pSquirrel<context>->pushstring(sqvm, R2::g_pLocalPlayerUserID);
+		g_pSquirrel<context>->pushstring(sqvm, g_pLocalPlayerUserID);
 		return SQRESULT_NOTNULL;
 	}
 
diff --git a/NorthstarDLL/scripts/server/miscserverscript.cpp b/NorthstarDLL/scripts/server/miscserverscript.cpp
index 3ea44ceb..ed6e4800 100644
--- a/NorthstarDLL/scripts/server/miscserverscript.cpp
+++ b/NorthstarDLL/scripts/server/miscserverscript.cpp
@@ -9,7 +9,7 @@
 
 ADD_SQFUNC("void", NSEarlyWritePlayerPersistenceForLeave, "entity player", "", ScriptContext::SERVER)
 {
-	const R2::CBasePlayer* pPlayer = g_pSquirrel<context>->template getentity<R2::CBasePlayer>(sqvm, 1);
+	const CBasePlayer* pPlayer = g_pSquirrel<context>->template getentity<CBasePlayer>(sqvm, 1);
 	if (!pPlayer)
 	{
 		spdlog::warn("NSEarlyWritePlayerPersistenceForLeave got null player");
@@ -18,7 +18,7 @@ ADD_SQFUNC("void", NSEarlyWritePlayerPersistenceForLeave, "entity player", "", S
 		return SQRESULT_NOTNULL;
 	}
 
-	R2::CBaseClient* pClient = &R2::g_pClientArray[pPlayer->m_nPlayerIndex - 1];
+	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);
@@ -38,7 +38,7 @@ ADD_SQFUNC("bool", NSIsWritingPlayerPersistence, "", "", ScriptContext::SERVER)
 
 ADD_SQFUNC("bool", NSIsPlayerLocalPlayer, "entity player", "", ScriptContext::SERVER)
 {
-	const R2::CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<R2::CBasePlayer>(sqvm, 1);
+	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<CBasePlayer>(sqvm, 1);
 	if (!pPlayer)
 	{
 		spdlog::warn("NSIsPlayerLocalPlayer got null player");
@@ -47,8 +47,8 @@ ADD_SQFUNC("bool", NSIsPlayerLocalPlayer, "entity player", "", ScriptContext::SE
 		return SQRESULT_NOTNULL;
 	}
 
-	R2::CBaseClient* pClient = &R2::g_pClientArray[pPlayer->m_nPlayerIndex - 1];
-	g_pSquirrel<context>->pushbool(sqvm, !strcmp(R2::g_pLocalPlayerUserID, pClient->m_UID));
+	CBaseClient* pClient = &g_pClientArray[pPlayer->m_nPlayerIndex - 1];
+	g_pSquirrel<context>->pushbool(sqvm, !strcmp(g_pLocalPlayerUserID, pClient->m_UID));
 	return SQRESULT_NOTNULL;
 }
 
@@ -65,7 +65,7 @@ ADD_SQFUNC(
 	"Disconnects the player from the server with the given reason",
 	ScriptContext::SERVER)
 {
-	const R2::CBasePlayer* pPlayer = g_pSquirrel<context>->template getentity<R2::CBasePlayer>(sqvm, 1);
+	const CBasePlayer* pPlayer = g_pSquirrel<context>->template getentity<CBasePlayer>(sqvm, 1);
 	const char* reason = g_pSquirrel<context>->getstring(sqvm, 2);
 
 	if (!pPlayer)
@@ -77,7 +77,7 @@ ADD_SQFUNC(
 	}
 
 	// Shouldn't happen but I like sanity checks.
-	R2::CBaseClient* pClient = &R2::g_pClientArray[pPlayer->m_nPlayerIndex - 1];
+	CBaseClient* pClient = &g_pClientArray[pPlayer->m_nPlayerIndex - 1];
 	if (!pClient)
 	{
 		spdlog::warn("NSDisconnectPlayer(): player entity has null CBaseClient!");
@@ -88,11 +88,11 @@ ADD_SQFUNC(
 
 	if (reason)
 	{
-		R2::CBaseClient__Disconnect(pClient, 1, reason);
+		CBaseClient__Disconnect(pClient, 1, reason);
 	}
 	else
 	{
-		R2::CBaseClient__Disconnect(pClient, 1, "Disconnected by the server.");
+		CBaseClient__Disconnect(pClient, 1, "Disconnected by the server.");
 	}
 
 	g_pSquirrel<context>->pushbool(sqvm, true);
diff --git a/NorthstarDLL/scripts/server/scriptuserinfo.cpp b/NorthstarDLL/scripts/server/scriptuserinfo.cpp
index fac458a3..c53a9d22 100644
--- a/NorthstarDLL/scripts/server/scriptuserinfo.cpp
+++ b/NorthstarDLL/scripts/server/scriptuserinfo.cpp
@@ -7,7 +7,7 @@ ADD_SQFUNC("string", GetUserInfoKVString_Internal, "entity player, string key, s
 	"Gets the string value of a given player's userinfo convar by name", ScriptContext::SERVER)
 // clang-format on
 {
-	const R2::CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<R2::CBasePlayer>(sqvm, 1);
+	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<CBasePlayer>(sqvm, 1);
 	if (!pPlayer)
 	{
 		g_pSquirrel<ScriptContext::SERVER>->raiseerror(sqvm, "player is null");
@@ -17,7 +17,7 @@ ADD_SQFUNC("string", GetUserInfoKVString_Internal, "entity player, string key, s
 	const char* pKey = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 2);
 	const char* pDefaultValue = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 3);
 
-	const char* pResult = R2::g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetString(pKey, pDefaultValue);
+	const char* pResult = g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetString(pKey, pDefaultValue);
 	g_pSquirrel<ScriptContext::SERVER>->pushstring(sqvm, pResult);
 	return SQRESULT_NOTNULL;
 }
@@ -27,7 +27,7 @@ ADD_SQFUNC("asset", GetUserInfoKVAsset_Internal, "entity player, string key, ass
 	"Gets the asset value of a given player's userinfo convar by name", ScriptContext::SERVER)
 // clang-format on
 {
-	const R2::CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<R2::CBasePlayer>(sqvm, 1);
+	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<CBasePlayer>(sqvm, 1);
 	if (!pPlayer)
 	{
 		g_pSquirrel<ScriptContext::SERVER>->raiseerror(sqvm, "player is null");
@@ -38,7 +38,7 @@ ADD_SQFUNC("asset", GetUserInfoKVAsset_Internal, "entity player, string key, ass
 	const char* pDefaultValue;
 	g_pSquirrel<ScriptContext::SERVER>->getasset(sqvm, 3, &pDefaultValue);
 
-	const char* pResult = R2::g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetString(pKey, 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;
 }
@@ -48,7 +48,7 @@ ADD_SQFUNC("int", GetUserInfoKVInt_Internal, "entity player, string key, int def
 	"Gets the int value of a given player's userinfo convar by name", ScriptContext::SERVER)
 // clang-format on
 {
-	const R2::CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<R2::CBasePlayer>(sqvm, 1);
+	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->template getentity<CBasePlayer>(sqvm, 1);
 	if (!pPlayer)
 	{
 		g_pSquirrel<ScriptContext::SERVER>->raiseerror(sqvm, "player is null");
@@ -58,7 +58,7 @@ ADD_SQFUNC("int", GetUserInfoKVInt_Internal, "entity player, string key, int def
 	const char* pKey = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 2);
 	const int iDefaultValue = g_pSquirrel<ScriptContext::SERVER>->getinteger(sqvm, 3);
 
-	const int iResult = R2::g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetInt(pKey, iDefaultValue);
+	const int iResult = g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetInt(pKey, iDefaultValue);
 	g_pSquirrel<ScriptContext::SERVER>->pushinteger(sqvm, iResult);
 	return SQRESULT_NOTNULL;
 }
@@ -68,7 +68,7 @@ ADD_SQFUNC("float", GetUserInfoKVFloat_Internal, "entity player, string key, flo
 	"Gets the float value of a given player's userinfo convar by name", ScriptContext::SERVER)
 // clang-format on
 {
-	const R2::CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->getentity<R2::CBasePlayer>(sqvm, 1);
+	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->getentity<CBasePlayer>(sqvm, 1);
 	if (!pPlayer)
 	{
 		g_pSquirrel<ScriptContext::SERVER>->raiseerror(sqvm, "player is null");
@@ -78,7 +78,7 @@ ADD_SQFUNC("float", GetUserInfoKVFloat_Internal, "entity player, string key, flo
 	const char* pKey = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 2);
 	const float flDefaultValue = g_pSquirrel<ScriptContext::SERVER>->getfloat(sqvm, 3);
 
-	const float flResult = R2::g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetFloat(pKey, flDefaultValue);
+	const float flResult = g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetFloat(pKey, flDefaultValue);
 	g_pSquirrel<ScriptContext::SERVER>->pushfloat(sqvm, flResult);
 	return SQRESULT_NOTNULL;
 }
@@ -88,7 +88,7 @@ ADD_SQFUNC("bool", GetUserInfoKVBool_Internal, "entity player, string key, bool
 	"Gets the bool value of a given player's userinfo convar by name", ScriptContext::SERVER)
 // clang-format on
 {
-	const R2::CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->getentity<R2::CBasePlayer>(sqvm, 1);
+	const CBasePlayer* pPlayer = g_pSquirrel<ScriptContext::SERVER>->getentity<CBasePlayer>(sqvm, 1);
 	if (!pPlayer)
 	{
 		g_pSquirrel<ScriptContext::SERVER>->raiseerror(sqvm, "player is null");
@@ -98,7 +98,7 @@ ADD_SQFUNC("bool", GetUserInfoKVBool_Internal, "entity player, string key, bool
 	const char* pKey = g_pSquirrel<ScriptContext::SERVER>->getstring(sqvm, 2);
 	const bool bDefaultValue = g_pSquirrel<ScriptContext::SERVER>->getbool(sqvm, 3);
 
-	const bool bResult = R2::g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetInt(pKey, bDefaultValue);
+	const bool bResult = g_pClientArray[pPlayer->m_nPlayerIndex - 1].m_ConVars->GetInt(pKey, bDefaultValue);
 	g_pSquirrel<ScriptContext::SERVER>->pushbool(sqvm, bResult);
 	return SQRESULT_NOTNULL;
 }