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>

1 files changed, 0 insertions, 233 deletions

diff --git a/NorthstarDLL/util/printmaps.cpp b/NorthstarDLL/util/printmaps.cpp
deleted file mode 100644
index d3253605..00000000
--- a/NorthstarDLL/util/printmaps.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-#include "printmaps.h"
-#include "core/convar/convar.h"
-#include "core/convar/concommand.h"
-#include "mods/modmanager.h"
-#include "core/tier0.h"
-#include "engine/r2engine.h"
-#include "squirrel/squirrel.h"
-
-#include <filesystem>
-#include <regex>
-
-AUTOHOOK_INIT()
-
-enum class MapSource_t
-{
-	VPK,
-	GAMEDIR,
-	MOD
-};
-
-const std::unordered_map<MapSource_t, const char*> PrintMapSource = {
-	{MapSource_t::VPK, "VPK"}, {MapSource_t::MOD, "MOD"}, {MapSource_t::GAMEDIR, "R2"}};
-
-struct MapVPKInfo
-{
-	std::string name;
-	std::string parent;
-	MapSource_t source;
-};
-
-// our current list of maps in the game
-std::vector<MapVPKInfo> vMapList;
-
-typedef void (*Host_Map_helperType)(const CCommand&, void*);
-typedef void (*Host_Changelevel_fType)(const CCommand&);
-
-Host_Map_helperType Host_Map_helper;
-Host_Changelevel_fType Host_Changelevel_f;
-
-void RefreshMapList()
-{
-	// Only update the maps list every 10 seconds max to we avoid constantly reading fs
-	static double fLastRefresh = -999;
-
-	if (fLastRefresh + 10.0 > g_pGlobals->m_flRealTime)
-		return;
-
-	fLastRefresh = g_pGlobals->m_flRealTime;
-
-	// Rebuild map list
-	vMapList.clear();
-
-	// get modded maps
-	// TODO: could probably check mod vpks to get mapnames from there too?
-	for (auto& modFilePair : g_pModManager->m_ModFiles)
-	{
-		ModOverrideFile file = modFilePair.second;
-		if (file.m_Path.extension() == ".bsp" && file.m_Path.parent_path().string() == "maps") // only allow mod maps actually in /maps atm
-		{
-			MapVPKInfo& map = vMapList.emplace_back();
-			map.name = file.m_Path.stem().string();
-			map.parent = file.m_pOwningMod->Name;
-			map.source = MapSource_t::MOD;
-		}
-	}
-
-	// get maps in vpk
-	{
-		const int iNumRetailNonMapVpks = 1;
-		static const char* const ppRetailNonMapVpks[] = {
-			"englishclient_frontend.bsp.pak000_dir.vpk"}; // don't include mp_common here as it contains mp_lobby
-
-		// matches directory vpks, and captures their map name in the first group
-		static const std::regex rVpkMapRegex("englishclient_([a-zA-Z0-9_]+)\\.bsp\\.pak000_dir\\.vpk", std::regex::icase);
-
-		for (fs::directory_entry file : fs::directory_iterator("./vpk"))
-		{
-			std::string pathString = file.path().filename().string();
-
-			bool bIsValidMapVpk = true;
-			for (int i = 0; i < iNumRetailNonMapVpks; i++)
-			{
-				if (!pathString.compare(ppRetailNonMapVpks[i]))
-				{
-					bIsValidMapVpk = false;
-					break;
-				}
-			}
-
-			if (!bIsValidMapVpk)
-				continue;
-
-			// run our map vpk regex on the filename
-			std::smatch match;
-			std::regex_match(pathString, match, rVpkMapRegex);
-
-			if (match.length() < 2)
-				continue;
-
-			std::string mapName = match[1].str();
-			// special case: englishclient_mp_common contains mp_lobby, so hardcode the name here
-			if (mapName == "mp_common")
-				mapName = "mp_lobby";
-
-			MapVPKInfo& map = vMapList.emplace_back();
-			map.name = mapName;
-			map.parent = pathString;
-			map.source = MapSource_t::VPK;
-		}
-	}
-
-	// get maps in game dir
-	std::string gameDir = fmt::format("{}/maps", g_pModName);
-	if (!std::filesystem::exists(gameDir))
-	{
-		return;
-	}
-
-	for (fs::directory_entry file : fs::directory_iterator(gameDir))
-	{
-		if (file.path().extension() == ".bsp")
-		{
-			MapVPKInfo& map = vMapList.emplace_back();
-			map.name = file.path().stem().string();
-			map.parent = "R2";
-			map.source = MapSource_t::GAMEDIR;
-		}
-	}
-}
-
-// clang-format off
-AUTOHOOK(_Host_Map_f_CompletionFunc, engine.dll + 0x161AE0,
-int, __fastcall, (const char *const cmdname, const char *const partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]))
-// clang-format on
-{
-	RefreshMapList();
-
-	// use a custom autocomplete func for all map loading commands
-	const int cmdLength = strlen(cmdname);
-	const char* query = partial + cmdLength;
-	const int queryLength = strlen(query);
-
-	int numMaps = 0;
-	for (int i = 0; i < vMapList.size() && numMaps < COMMAND_COMPLETION_MAXITEMS; i++)
-	{
-		if (!strncmp(query, vMapList[i].name.c_str(), queryLength))
-		{
-			strcpy(commands[numMaps], cmdname);
-			strncpy_s(
-				commands[numMaps++] + cmdLength,
-				COMMAND_COMPLETION_ITEM_LENGTH,
-				&vMapList[i].name[0],
-				COMMAND_COMPLETION_ITEM_LENGTH - cmdLength);
-		}
-	}
-
-	return numMaps;
-}
-
-ADD_SQFUNC(
-	"array<string>",
-	NSGetLoadedMapNames,
-	"",
-	"Returns a string array of loaded map file names",
-	ScriptContext::UI | ScriptContext::CLIENT | ScriptContext::SERVER)
-{
-	// Maybe we should call this on mods reload instead
-	RefreshMapList();
-
-	g_pSquirrel<context>->newarray(sqvm, 0);
-
-	for (MapVPKInfo& map : vMapList)
-	{
-		g_pSquirrel<context>->pushstring(sqvm, map.name.c_str());
-		g_pSquirrel<context>->arrayappend(sqvm, -2);
-	}
-
-	return SQRESULT_NOTNULL;
-}
-
-void ConCommand_maps(const CCommand& args)
-{
-	if (args.ArgC() < 2)
-	{
-		spdlog::info("Usage: maps <substring>");
-		spdlog::info("maps * for full listing");
-		return;
-	}
-
-	RefreshMapList();
-
-	for (MapVPKInfo& map : vMapList) // need to figure out a nice way to include parent path without making the formatting awful
-		if ((*args.Arg(1) == '*' && !args.Arg(1)[1]) || strstr(map.name.c_str(), args.Arg(1)))
-			spdlog::info("({}) {}", PrintMapSource.at(map.source), map.name);
-}
-
-// clang-format off
-AUTOHOOK(Host_Map_f, engine.dll + 0x15B340, void, __fastcall, (const CCommand& args))
-// clang-format on
-{
-	RefreshMapList();
-
-	if (args.ArgC() > 1 &&
-		std::find_if(vMapList.begin(), vMapList.end(), [&](MapVPKInfo map) -> bool { return map.name == args.Arg(1); }) == vMapList.end())
-	{
-		spdlog::warn("Map load failed: {} not found or invalid", args.Arg(1));
-		return;
-	}
-	else if (args.ArgC() == 1)
-	{
-		spdlog::warn("Map load failed: no map name provided");
-		return;
-	}
-
-	if (*g_pServerState >= server_state_t::ss_active)
-		return Host_Changelevel_f(args);
-	else
-		return Host_Map_helper(args, nullptr);
-}
-
-void InitialiseMapsPrint()
-{
-	AUTOHOOK_DISPATCH()
-
-	ConCommand* mapsCommand = g_pCVar->FindCommand("maps");
-	mapsCommand->m_pCommandCallback = ConCommand_maps;
-}
-
-ON_DLL_LOAD("engine.dll", Host_Map_f, (CModule module))
-{
-	Host_Map_helper = module.Offset(0x15AEF0).RCast<Host_Map_helperType>();
-	Host_Changelevel_f = module.Offset(0x15AAD0).RCast<Host_Changelevel_fType>();
-}