big refactor (#171)v1.10.0-rc1

* use in-file macros rather than global funcs for registering dll load callbacks

* move more things to macros

* fix debug crashes

* move sqvm funcs to sq managers

* get rid of context file

* refactor some squirrel stuff and ingame compilation error message

* move tier0 and playlist funcs to namespaces

* uiscript_reset concommand: don't loop forever if compilation fails

* improve showing console for ui script compile errors

* standardise concommand func naming in c++

* use lambdas for dll load callbacks so intellisense shits itself less

* use cvar change callbacks for unescaping ns_server_name and ns_server_desc

* add proper helpstrings to masterserver cvars

* add cvar help and find

* allow parsing of convar flags from string

* normalise mod fs paths to be lowercase

* move hoststate to its own file and add host_init hooks

* better IsFlagSet def

* replace files in ReadFromCache

* rename g_ModManager to g_pModManager

* formatting changes

* make cvar print work on dedi, move demo fix stuff, add findflags

* add proper map autocompletes and maps command

* formatting changes

* separate gameutils into multiple r2 headers

* Update keyvalues.cpp

* move sqvm funcs into wrappers in the manager class

* remove unnecessary header files

* lots of cleanup and starting moving to new hooking macros

* update more stuff to new hook macros

* rename project folder (:tf: commit log)

* fix up postbuild commands to use relative dir

* almost fully replaced hooking lib

* completely remove old hooking

* add nsprefix because i forgot to include it

* move exploit prevention and limits code out of serverauthentication, and have actual defs for CBasePlayer

* use modular ServerPresence system for registering servers

* add new memory lib

* accidentally pushed broke code oops

* lots of stuff idk

* implement some more prs

* improve rpakfilesystem

* fix line endings on vcxproj

* Revert "fix line endings on vcxproj"

This reverts commit 4ff7d022d2602c2dba37beba8b8df735cf5cd7d9.

* add more prs

* i swear i committed these how are they not there

* Add ability to load Datatables from files (#238)

* first version of kinda working custom datatables

* Fix copy error

* Finish custom datatables

* Fix Merge

* Fix line endings

* Add fallback to rpak when ns_prefere_datatable_from_disk is true

* fix typo

* Bug fixess

* Fix Function Registration hook

* Set convar value

* Fix Client and Ui VM

* enable server auth with ms agian

* Add Filters

* FIx unused import

* Merge remote-tracking branch 'upsteam/bobs-big-refactor-pr' into datatables

Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>

* Add some changes from main to refactor (#243)

* Add PR template

* Update CI folder location

* Delete startup args txt files

* Fix line endings (hopefully) (#244)

* Fix line endings (hopefully)

* Fix more line endings

* Update refactor (#250)

* Add PR template

* Update CI folder location

* Delete startup args txt files

* Add editorconfig file (#246)

* Add editorconfig file

It's a cross-editor compatible config file that defines certain editor
behaviour (e.g. adding/removing newline at end of file)

It is supported by major editors like Visual Studio (Code) and by
version control  providers like GitHub.

Should end the constant adding/removing of final newline in PRs

* More settings

- unicode by default
- trim newlines
- use tabs for indentation (ugh)

* Ignore folder rename (#245)

* Hot reload banlist on player join (#233)

* added banlist hotreload

* fix formatting

* didnt append, cleared whole file oopsie

* unfuckedunban not rewriting file

* fixed not checking for new line

Co-authored-by: ScureX <47725553+ScureX@users.noreply.github.com>

* Refactor cleanup (#256)

* Fix indentation

* Fix path in clang-format command in readme

* Refactor cleanup (some formatting fixes) (#257)

* Fix some formatting

* More formatting fixes

* add scriptdatatable.cpp rewrite

* Some formatting fixes (#260)

* More formatting stuff (#261)

* various formatting changes and fixes

* Fix changed icon (#264)

* clang format, fix issues with server registration and rpak loading

* fix more formatting

* update postbuild step

* set launcher directory and error on fail creating log files

* change some stuff in exploitfixes

* only unrestrict dev commands when commandline flag is present

* fix issues with cvar flag commit

* fixup command flags better and reformat

* bring up to date with main

* fixup formatting

* improve cvar flag fixup and remove temp thing from findflags

* set serverfilter better

* avoid ptr decay when setting auth token

* add more entity functions

* Fix the MS server registration issues. (#285)

* Port ms presence reporter to std::async

* Fix crash due to std::optional being assigned nullptr.

* Fix formatting.

* Wait 20 seconds if MS returns DUPLICATE_SERVER.

* Change PERSISTENCE_MAX_SIZE to fix player authentication (#287)

The size check added in the refactor was incorrect:

- 56306: expected pdata size based on the pdef
- 512: allowance for trailing junk (r2 adds 137 bytes of trailing junk)
- 100: for some wiggle room

Co-Authored-By: pg9182 <96569817+pg9182@users.noreply.github.com>

* change miscserverscript to use actual entity arguments rather than
player index jank

* Fix token clearing hook (#290)

A certain someone forgot to put an `0x` in front of their hex number, meaning the offset is wrong.
This would cause token to be leaked again

Co-authored-by: Maya <malte.hoermeyer@web.de>
Co-authored-by: RoyalBlue1 <realEmail@veryRealURL.com>
Co-authored-by: GeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>
Co-authored-by: ScureX <47725553+ScureX@users.noreply.github.com>
Co-authored-by: Erlite <ys.aameziane@gmail.com>
Co-authored-by: Emma Miler <emma.pi@protonmail.com>
Co-authored-by: pg9182 <96569817+pg9182@users.noreply.github.com>

1 files changed, 168 insertions, 0 deletions

diff --git a/NorthstarDLL/printmaps.cpp b/NorthstarDLL/printmaps.cpp
new file mode 100644
index 00000000..c378daad
--- /dev/null
+++ b/NorthstarDLL/printmaps.cpp
@@ -0,0 +1,168 @@
+#include "pch.h"
+#include "printmaps.h"
+#include "convar.h"
+#include "concommand.h"
+#include "modmanager.h"
+#include "tier0.h"
+#include "r2engine.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;
+
+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.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-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(fmt::format("{}/maps", R2::g_pModName)))
+	{
+		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
+{
+	// 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 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;
+}
+
+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()
+{
+	AUTOHOOK_DISPATCH()
+
+	ConCommand* mapsCommand = R2::g_pCVar->FindCommand("maps");
+	mapsCommand->m_pCommandCallback = ConCommand_maps;
+}