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>

6 files changed, 9 insertions, 9 deletions

diff --git a/NorthstarDLL/mods/compiled/kb_act.cpp b/NorthstarDLL/mods/compiled/kb_act.cpp
index 3fc7ee30..6117fd28 100644
--- a/NorthstarDLL/mods/compiled/kb_act.cpp
+++ b/NorthstarDLL/mods/compiled/kb_act.cpp
@@ -14,7 +14,7 @@ void ModManager::BuildKBActionsList()
 	std::ofstream soCompiledKeys(GetCompiledAssetsPath() / KB_ACT_PATH, std::ios::binary);
 
 	// write vanilla file's content to compiled file
-	soCompiledKeys << R2::ReadVPKOriginalFile(KB_ACT_PATH);
+	soCompiledKeys << ReadVPKOriginalFile(KB_ACT_PATH);
 
 	for (Mod& mod : m_LoadedMods)
 	{
diff --git a/NorthstarDLL/mods/compiled/modkeyvalues.cpp b/NorthstarDLL/mods/compiled/modkeyvalues.cpp
index fe262a60..e44a81d3 100644
--- a/NorthstarDLL/mods/compiled/modkeyvalues.cpp
+++ b/NorthstarDLL/mods/compiled/modkeyvalues.cpp
@@ -56,7 +56,7 @@ void ModManager::TryBuildKeyValues(const char* filename)
 	newKvs += "\"\n";
 
 	// load original file, so we can parse out the name of the root obj (e.g. WeaponData for weapons)
-	std::string originalFile = R2::ReadVPKOriginalFile(filename);
+	std::string originalFile = ReadVPKOriginalFile(filename);
 
 	if (!originalFile.length())
 	{
diff --git a/NorthstarDLL/mods/compiled/modpdef.cpp b/NorthstarDLL/mods/compiled/modpdef.cpp
index 4b1b12b7..d268a063 100644
--- a/NorthstarDLL/mods/compiled/modpdef.cpp
+++ b/NorthstarDLL/mods/compiled/modpdef.cpp
@@ -15,7 +15,7 @@ void ModManager::BuildPdef()
 	fs::path MOD_PDEF_PATH = fs::path(GetCompiledAssetsPath() / MOD_PDEF_SUFFIX);
 
 	fs::remove(MOD_PDEF_PATH);
-	std::string pdef = R2::ReadVPKOriginalFile(VPK_PDEF_PATH);
+	std::string pdef = ReadVPKOriginalFile(VPK_PDEF_PATH);
 
 	for (Mod& mod : m_LoadedMods)
 	{
diff --git a/NorthstarDLL/mods/compiled/modscriptsrson.cpp b/NorthstarDLL/mods/compiled/modscriptsrson.cpp
index cbe26651..d130745f 100644
--- a/NorthstarDLL/mods/compiled/modscriptsrson.cpp
+++ b/NorthstarDLL/mods/compiled/modscriptsrson.cpp
@@ -13,7 +13,7 @@ void ModManager::BuildScriptsRson()
 	fs::path MOD_SCRIPTS_RSON_PATH = fs::path(GetCompiledAssetsPath() / MOD_SCRIPTS_RSON_SUFFIX);
 	fs::remove(MOD_SCRIPTS_RSON_PATH);
 
-	std::string scriptsRson = R2::ReadVPKOriginalFile(VPK_SCRIPTS_RSON_PATH);
+	std::string scriptsRson = ReadVPKOriginalFile(VPK_SCRIPTS_RSON_PATH);
 	scriptsRson += "\n\n// START MODDED SCRIPT CONTENT\n\n"; // newline before we start custom stuff
 
 	for (Mod& mod : m_LoadedMods)
diff --git a/NorthstarDLL/mods/modmanager.cpp b/NorthstarDLL/mods/modmanager.cpp
index 982f5068..8a0eb71d 100644
--- a/NorthstarDLL/mods/modmanager.cpp
+++ b/NorthstarDLL/mods/modmanager.cpp
@@ -760,7 +760,7 @@ void ModManager::LoadMods()
 		{
 			// make sure convar isn't registered yet, unsure if necessary but idk what
 			// behaviour is for defining same convar multiple times
-			if (!R2::g_pCVar->FindVar(convar->Name.c_str()))
+			if (!g_pCVar->FindVar(convar->Name.c_str()))
 			{
 				new ConVar(convar->Name.c_str(), convar->DefaultValue.c_str(), convar->Flags, convar->HelpString.c_str());
 			}
@@ -769,7 +769,7 @@ void ModManager::LoadMods()
 		for (ModConCommand* command : mod.ConCommands)
 		{
 			// make sure command isnt't registered multiple times.
-			if (!R2::g_pCVar->FindCommand(command->Name.c_str()))
+			if (!g_pCVar->FindCommand(command->Name.c_str()))
 			{
 				ConCommand* newCommand = new ConCommand();
 				std::string funcName = command->Function;
@@ -818,7 +818,7 @@ void ModManager::LoadMods()
 					modVpk.m_sVpkPath = (file.path().parent_path() / vpkName).string();
 
 					if (m_bHasLoadedMods && modVpk.m_bAutoLoad)
-						(*R2::g_pFilesystem)->m_vtable->MountVPK(*R2::g_pFilesystem, vpkName.c_str());
+						(*g_pFilesystem)->m_vtable->MountVPK(*g_pFilesystem, vpkName.c_str());
 				}
 			}
 		}
diff --git a/NorthstarDLL/mods/modsavefiles.cpp b/NorthstarDLL/mods/modsavefiles.cpp
index f8e5848c..68e33864 100644
--- a/NorthstarDLL/mods/modsavefiles.cpp
+++ b/NorthstarDLL/mods/modsavefiles.cpp
@@ -561,9 +561,9 @@ ON_DLL_LOAD("engine.dll", ModSaveFFiles_Init, (CModule module))
 {
 	savePath = fs::path(GetNorthstarPrefix()) / "save_data";
 	g_pSaveFileManager = new SaveFileManager;
-	int parm = Tier0::CommandLine()->FindParm("-maxfoldersize");
+	int parm = CommandLine()->FindParm("-maxfoldersize");
 	if (parm)
-		MAX_FOLDER_SIZE = std::stoi(Tier0::CommandLine()->GetParm(parm));
+		MAX_FOLDER_SIZE = std::stoi(CommandLine()->GetParm(parm));
 }
 
 int GetMaxSaveFolderSize()