1 files changed, 27 insertions, 46 deletions

diff --git a/NorthstarDedicatedTest/sourceconsole.cpp b/NorthstarDedicatedTest/sourceconsole.cpp
index 7627a2f1..55e78ad3 100644
--- a/NorthstarDedicatedTest/sourceconsole.cpp
+++ b/NorthstarDedicatedTest/sourceconsole.cpp
@@ -5,29 +5,41 @@
 #include "concommand.h"
 #include "printcommand.h"
 
-SourceInterface<CGameConsole>* g_SourceGameConsole;
+SourceInterface<CGameConsole>* g_pSourceGameConsole;
 
 void ConCommand_toggleconsole(const CCommand& arg)
 {
-	if ((*g_SourceGameConsole)->IsConsoleVisible())
-		(*g_SourceGameConsole)->Hide();
+	if ((*g_pSourceGameConsole)->IsConsoleVisible())
+		(*g_pSourceGameConsole)->Hide();
 	else
-		(*g_SourceGameConsole)->Activate();
+		(*g_pSourceGameConsole)->Activate();
 }
 
 void ConCommand_showconsole(const CCommand& arg)
 {
-	(*g_SourceGameConsole)->Activate();
+	(*g_pSourceGameConsole)->Activate();
 }
 
 void ConCommand_hideconsole(const CCommand& arg)
 {
-	(*g_SourceGameConsole)->Hide();
+	(*g_pSourceGameConsole)->Hide();
 }
 
-typedef void (*OnCommandSubmittedType)(CConsoleDialog* consoleDialog, const char* pCommand);
-OnCommandSubmittedType onCommandSubmittedOriginal;
-void OnCommandSubmittedHook(CConsoleDialog* consoleDialog, const char* pCommand)
+void SourceConsoleSink::sink_it_(const spdlog::details::log_msg& msg)
+{
+	if (!(*g_pSourceGameConsole)->m_bInitialized)
+		return;
+
+	spdlog::memory_buf_t formatted;
+	spdlog::sinks::base_sink<std::mutex>::formatter_->format(msg, formatted);
+	(*g_pSourceGameConsole)
+		->m_pConsole->m_pConsolePanel->ColorPrint(m_LogColours[msg.level], fmt::to_string(formatted).c_str());
+}
+
+void SourceConsoleSink::flush_() {}
+
+HOOK(OnCommandSubmittedHook, OnCommandSubmitted, 
+void,, (CConsoleDialog* consoleDialog, const char* pCommand),
 {
 	consoleDialog->m_pConsolePanel->Print("] ");
 	consoleDialog->m_pConsolePanel->Print(pCommand);
@@ -35,55 +47,24 @@ void OnCommandSubmittedHook(CConsoleDialog* consoleDialog, const char* pCommand)
 
 	TryPrintCvarHelpForCommand(pCommand);
 
-	onCommandSubmittedOriginal(consoleDialog, pCommand);
-}
+	OnCommandSubmitted(consoleDialog, pCommand);
+})
 
 // called from sourceinterface.cpp in client createinterface hooks, on GameClientExports001
 void InitialiseConsoleOnInterfaceCreation()
 {
-	(*g_SourceGameConsole)->Initialize();
+	(*g_pSourceGameConsole)->Initialize();
+	// hook OnCommandSubmitted so we print inputted commands
+	OnCommandSubmittedHook.Dispatch((*g_pSourceGameConsole)->m_pConsole->m_vtable->OnCommandSubmitted);
 
 	auto consoleLogger = std::make_shared<SourceConsoleSink>();
 	consoleLogger->set_pattern("[%l] %v");
-
 	spdlog::default_logger()->sinks().push_back(consoleLogger);
-
-	// hook OnCommandSubmitted so we print inputted commands
-	HookEnabler hook;
-	ENABLER_CREATEHOOK(
-		hook,
-		(void*)((*g_SourceGameConsole)->m_pConsole->m_vtable->OnCommandSubmitted),
-		&OnCommandSubmittedHook,
-		reinterpret_cast<LPVOID*>(&onCommandSubmittedOriginal));
-}
-
-SourceConsoleSink::SourceConsoleSink()
-{
-	logColours.emplace(spdlog::level::trace, SourceColor(0, 255, 255, 255));
-	logColours.emplace(spdlog::level::debug, SourceColor(0, 255, 255, 255));
-	logColours.emplace(spdlog::level::info, SourceColor(255, 255, 255, 255));
-	logColours.emplace(spdlog::level::warn, SourceColor(255, 255, 0, 255));
-	logColours.emplace(spdlog::level::err, SourceColor(255, 0, 0, 255));
-	logColours.emplace(spdlog::level::critical, SourceColor(255, 0, 0, 255));
-	logColours.emplace(spdlog::level::off, SourceColor(0, 0, 0, 0));
-}
-
-void SourceConsoleSink::sink_it_(const spdlog::details::log_msg& msg)
-{
-	if (!(*g_SourceGameConsole)->m_bInitialized)
-		return;
-
-	spdlog::memory_buf_t formatted;
-	spdlog::sinks::base_sink<std::mutex>::formatter_->format(msg, formatted);
-	(*g_SourceGameConsole)
-		->m_pConsole->m_pConsolePanel->ColorPrint(logColours[msg.level], fmt::to_string(formatted).c_str()); // todo needs colour support
 }
 
-void SourceConsoleSink::flush_() {}
-
 ON_DLL_LOAD_CLIENT_RELIESON("client.dll", SourceConsole, ConCommand, [](HMODULE baseAddress)
 {
-	g_SourceGameConsole = new SourceInterface<CGameConsole>("client.dll", "GameConsole004");
+	g_pSourceGameConsole = new SourceInterface<CGameConsole>("client.dll", "GameConsole004");
 	RegisterConCommand("toggleconsole", ConCommand_toggleconsole, "Show/hide the console.", FCVAR_DONTRECORD);
 	RegisterConCommand("showconsole", ConCommand_showconsole, "Show the console.", FCVAR_DONTRECORD);
 	RegisterConCommand("hideconsole", ConCommand_hideconsole, "Hide the console.", FCVAR_DONTRECORD);