From 2ae34b67e36b8ba05132d481876eb4ed7a826283 Mon Sep 17 00:00:00 2001
From: BobTheBob9 <for.oliver.kirkham@gmail.com>
Date: Thu, 7 Jul 2022 21:31:41 +0100
Subject: almost fully replaced hooking lib

---
 NorthstarDLL/host.cpp | 140 +++++++++++++++++++++++++-------------------------
 1 file changed, 70 insertions(+), 70 deletions(-)

(limited to 'NorthstarDLL/host.cpp')

diff --git a/NorthstarDLL/host.cpp b/NorthstarDLL/host.cpp
index a1cb65ff..8199a0c0 100644
--- a/NorthstarDLL/host.cpp
+++ b/NorthstarDLL/host.cpp
@@ -1,71 +1,71 @@
-#include "pch.h"
-#include "convar.h"
-#include "modmanager.h"
-#include "printcommand.h"
-#include "printmaps.h"
-#include "r2engine.h"
-
-AUTOHOOK_INIT()
-
-AUTOHOOK(Host_Init, engine.dll + 0x155EA0,
-void,, (bool bDedicated),
-{
-	spdlog::info("Host_Init()");
-	Host_Init(bDedicated);
-
-	// get all mod convars
-	std::vector<std::string> vModConvarNames;
-	for (auto& mod : g_pModManager->m_loadedMods)
-		for (auto& cvar : mod.ConVars)
-			vModConvarNames.push_back(cvar->Name);
-
-	// strip hidden and devonly cvar flags
-	int iNumCvarsAltered = 0;
-	for (auto& pair : R2::g_pCVar->DumpToMap())
-	{
-		// don't remove from mod cvars
-		if (std::find(vModConvarNames.begin(), vModConvarNames.end(), pair.second->m_pszName) != vModConvarNames.end())
-			continue;
-
-		// strip flags
-		int flags = pair.second->GetFlags();
-		if (flags & FCVAR_DEVELOPMENTONLY)
-		{
-			flags &= ~FCVAR_DEVELOPMENTONLY;
-			iNumCvarsAltered++;
-		}
-
-		if (flags & FCVAR_HIDDEN)
-		{
-			flags &= ~FCVAR_HIDDEN;
-			iNumCvarsAltered++;
-		}
-
-		pair.second->m_nFlags = flags;
-	}
-
-	spdlog::info("Removed {} hidden/devonly cvar flags", iNumCvarsAltered);
-
-	// make servers able to run disconnect on clients
-	R2::g_pCVar->FindCommand("disconnect")->m_nFlags |= FCVAR_SERVER_CAN_EXECUTE;
-
-	// make clients able to run status and ping
-	R2::g_pCVar->FindCommand("status")->m_nFlags |= FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS;
-	R2::g_pCVar->FindCommand("ping")->m_nFlags |= FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS;
-
-	// need to initialise these after host_init since they do stuff to preexisting concommands/convars without being client/server specific
-	InitialiseCommandPrint();
-	InitialiseMapsPrint();
-
-	// client/server autoexecs on necessary platforms
-	// dedi needs autoexec_ns_server on boot, while non-dedi will run it on on listen server start
-	if (bDedicated)
-		R2::Cbuf_AddText(R2::Cbuf_GetCurrentPlayer(), "exec autoexec_ns_server", R2::cmd_source_t::kCommandSrcCode);
-	else
-		R2::Cbuf_AddText(R2::Cbuf_GetCurrentPlayer(), "exec autoexec_ns_client", R2::cmd_source_t::kCommandSrcCode);
-})
-
-ON_DLL_LOAD("engine.dll", Host_Init, [](HMODULE baseAddress)
-{ 
-	AUTOHOOK_DISPATCH()
+#include "pch.h"
+#include "convar.h"
+#include "modmanager.h"
+#include "printcommand.h"
+#include "printmaps.h"
+#include "r2engine.h"
+
+AUTOHOOK_INIT()
+
+AUTOHOOK(Host_Init, engine.dll + 0x155EA0,
+void,, (bool bDedicated))
+{
+	spdlog::info("Host_Init()");
+	Host_Init(bDedicated);
+
+	// get all mod convars
+	std::vector<std::string> vModConvarNames;
+	for (auto& mod : g_pModManager->m_LoadedMods)
+		for (auto& cvar : mod.ConVars)
+			vModConvarNames.push_back(cvar->Name);
+
+	// strip hidden and devonly cvar flags
+	int iNumCvarsAltered = 0;
+	for (auto& pair : R2::g_pCVar->DumpToMap())
+	{
+		// don't remove from mod cvars
+		if (std::find(vModConvarNames.begin(), vModConvarNames.end(), pair.second->m_pszName) != vModConvarNames.end())
+			continue;
+
+		// strip flags
+		int flags = pair.second->GetFlags();
+		if (flags & FCVAR_DEVELOPMENTONLY)
+		{
+			flags &= ~FCVAR_DEVELOPMENTONLY;
+			iNumCvarsAltered++;
+		}
+
+		if (flags & FCVAR_HIDDEN)
+		{
+			flags &= ~FCVAR_HIDDEN;
+			iNumCvarsAltered++;
+		}
+
+		pair.second->m_nFlags = flags;
+	}
+
+	spdlog::info("Removed {} hidden/devonly cvar flags", iNumCvarsAltered);
+
+	// make servers able to run disconnect on clients
+	R2::g_pCVar->FindCommand("disconnect")->m_nFlags |= FCVAR_SERVER_CAN_EXECUTE;
+
+	// make clients able to run status and ping
+	R2::g_pCVar->FindCommand("status")->m_nFlags |= FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS;
+	R2::g_pCVar->FindCommand("ping")->m_nFlags |= FCVAR_GAMEDLL_FOR_REMOTE_CLIENTS;
+
+	// need to initialise these after host_init since they do stuff to preexisting concommands/convars without being client/server specific
+	InitialiseCommandPrint();
+	InitialiseMapsPrint();
+
+	// client/server autoexecs on necessary platforms
+	// dedi needs autoexec_ns_server on boot, while non-dedi will run it on on listen server start
+	if (bDedicated)
+		R2::Cbuf_AddText(R2::Cbuf_GetCurrentPlayer(), "exec autoexec_ns_server", R2::cmd_source_t::kCommandSrcCode);
+	else
+		R2::Cbuf_AddText(R2::Cbuf_GetCurrentPlayer(), "exec autoexec_ns_client", R2::cmd_source_t::kCommandSrcCode);
+}
+
+ON_DLL_LOAD("engine.dll", Host_Init, [](HMODULE baseAddress)
+{ 
+	AUTOHOOK_DISPATCH()
 })
\ No newline at end of file
-- 
cgit v1.2.3