add proper map autocompletes and maps command

2 files changed, 181 insertions, 3 deletions

diff --git a/NorthstarDedicatedTest/concommand.h b/NorthstarDedicatedTest/concommand.h
index 90eb5b01..ca78381b 100644
--- a/NorthstarDedicatedTest/concommand.h
+++ b/NorthstarDedicatedTest/concommand.h
@@ -72,6 +72,19 @@ inline const char* CCommand::operator[](int nIndex) const
 	return Arg(nIndex);
 }
 
+//-----------------------------------------------------------------------------
+// Called when a ConCommand needs to execute
+//-----------------------------------------------------------------------------
+typedef void (*FnCommandCallback_t)(const CCommand& command);
+
+#define COMMAND_COMPLETION_MAXITEMS 64
+#define COMMAND_COMPLETION_ITEM_LENGTH 128
+
+//-----------------------------------------------------------------------------
+// Returns 0 to COMMAND_COMPLETION_MAXITEMS worth of completion strings
+//-----------------------------------------------------------------------------
+typedef int (*FnCommandCompletionCallback)(const char* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]);
+
 // From r5reloaded
 class ConCommandBase
 {
@@ -113,8 +126,8 @@ class ConCommand : public ConCommandBase
 	void Init(void);
 	bool IsCommand(void) const;
 
-	void* m_pCommandCallback {}; // 0x0040 <- starts from 0x40 since we inherit ConCommandBase.
-	void* m_pCompletionCallback {}; // 0x0048 <- defaults to sub_180417410 ('xor eax, eax').
+	FnCommandCallback_t m_pCommandCallback {}; // 0x0040 <- starts from 0x40 since we inherit ConCommandBase.
+	FnCommandCompletionCallback m_pCompletionCallback {}; // 0x0048 <- defaults to sub_180417410 ('xor eax, eax').
 	int m_nCallbackFlags {}; // 0x0050
 	char pad_0054[4]; // 0x0054
 	int unk0; // 0x0058
diff --git a/NorthstarDedicatedTest/mapsprint.cpp b/NorthstarDedicatedTest/mapsprint.cpp
index 770fb9cf..ca66487e 100644
--- a/NorthstarDedicatedTest/mapsprint.cpp
+++ b/NorthstarDedicatedTest/mapsprint.cpp
@@ -1,7 +1,172 @@
 #include "pch.h"
 #include "mapsprint.h"
+#include "convar.h"
+#include "concommand.h"
+#include "modmanager.h"
+#include "tier0.h"
+#include <filesystem>
+#include <regex>
 
-void InitialiseMapsPrint() 
+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;
+
+void RefreshMapList() 
+{
+	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.path.extension() == ".bsp" && file.path.parent_path().string() == "maps") // only allow mods actually in /maps atm
+		{
+			MapVPKInfo& map = vMapList.emplace_back();
+			map.name = file.path.stem().string();
+			map.parent = file.owningMod->Name;
+			map.source = MapSource_t::MOD;
+		}
+	}
+
+	// get maps in vpk
+	{
+		const int iNumRetailNonMapVpks = 1;
+		static const char* 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-Z_]+)\\.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
+	for (fs::directory_entry file : fs::directory_iterator("./r2/maps"))
+	{
+		if (file.path().extension() == ".bsp")
+		{
+			MapVPKInfo& map = vMapList.emplace_back();
+			map.name = file.path().stem().string();
+			map.parent = "R2";
+			map.source = MapSource_t::GAMEDIR;
+		}
+	}
+}
+
+typedef int (*_Host_Map_f_CompletionFuncType)(
+	char const* cmdname, char const* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH]);
+_Host_Map_f_CompletionFuncType _Host_Map_f_CompletionFunc;
+int _Host_Map_f_CompletionFuncHook(
+	char const* cmdname, char const* partial, char commands[COMMAND_COMPLETION_MAXITEMS][COMMAND_COMPLETION_ITEM_LENGTH])
+{
+	// don't update our map list often from this func, only refresh every 10 seconds so we avoid constantly reading fs
+	static double flLastAutocompleteRefresh = -999;
+
+	if (flLastAutocompleteRefresh + 10.0 < Tier0::Plat_FloatTime())
+	{
+		RefreshMapList();	
+		flLastAutocompleteRefresh = Tier0::Plat_FloatTime();
+	}
+
+	// use a custom autocomplete func for all map loading command
+	const int cmdLength = strlen(cmdname);
+	const char* query = partial + cmdLength;
+	const int queryLength = strlen(query);
+
+	int numMaps = 0;
+	for (int i = 0; i < COMMAND_COMPLETION_MAXITEMS && i < vMapList.size(); 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;
+}
+
+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);
+}
+
+void InitialiseMapsPrint()
+{
+	ConCommand* mapsCommand = g_pCVar->FindCommand("maps");
+	mapsCommand->m_pCommandCallback = ConCommand_maps;
+
+	HookEnabler hook;
+	ENABLER_CREATEHOOK(
+		hook,
+		(char*)GetModuleHandleA("engine.dll") + 0x161AE0,
+		&_Host_Map_f_CompletionFuncHook,
+		reinterpret_cast<LPVOID*>(&_Host_Map_f_CompletionFunc));
 }
\ No newline at end of file