From 79fbb9b9a751d6c3a863b1fed95cd8480a1586ab Mon Sep 17 00:00:00 2001
From: F1F7Y <64418963+F1F7Y@users.noreply.github.com>
Date: Mon, 2 Sep 2024 17:11:47 +0200
Subject: logging: Remove use of `SourceInterface` for `CGameConsole` (#803)

`SourceInteface` class goes back to icepick and is not good. We have a replacement, let's use it.
---
 primedev/logging/sourceconsole.cpp | 32 ++++++++++++++++----------------
 primedev/logging/sourceconsole.h   |  2 --
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/primedev/logging/sourceconsole.cpp b/primedev/logging/sourceconsole.cpp
index 55be4723..c9063d19 100644
--- a/primedev/logging/sourceconsole.cpp
+++ b/primedev/logging/sourceconsole.cpp
@@ -1,35 +1,35 @@
 #include "core/convar/convar.h"
 #include "sourceconsole.h"
-#include "core/sourceinterface.h"
+#include "core/tier1.h"
 #include "core/convar/concommand.h"
 #include "util/printcommands.h"
 
-SourceInterface<CGameConsole>* g_pSourceGameConsole;
+CGameConsole* g_pGameConsole;
 
 void ConCommand_toggleconsole(const CCommand& arg)
 {
 	NOTE_UNUSED(arg);
-	if ((*g_pSourceGameConsole)->IsConsoleVisible())
-		(*g_pSourceGameConsole)->Hide();
+	if (g_pGameConsole->IsConsoleVisible())
+		g_pGameConsole->Hide();
 	else
-		(*g_pSourceGameConsole)->Activate();
+		g_pGameConsole->Activate();
 }
 
 void ConCommand_showconsole(const CCommand& arg)
 {
 	NOTE_UNUSED(arg);
-	(*g_pSourceGameConsole)->Activate();
+	g_pGameConsole->Activate();
 }
 
 void ConCommand_hideconsole(const CCommand& arg)
 {
 	NOTE_UNUSED(arg);
-	(*g_pSourceGameConsole)->Hide();
+	g_pGameConsole->Hide();
 }
 
 void SourceConsoleSink::custom_sink_it_(const custom_log_msg& msg)
 {
-	if (!(*g_pSourceGameConsole)->m_bInitialized)
+	if (!g_pGameConsole->m_bInitialized)
 		return;
 
 	spdlog::memory_buf_t formatted;
@@ -41,11 +41,11 @@ void SourceConsoleSink::custom_sink_it_(const custom_log_msg& msg)
 	SourceColor levelColor = m_LogColours[msg.level];
 	std::string name {msg.logger_name.begin(), msg.logger_name.end()};
 
-	(*g_pSourceGameConsole)->m_pConsole->m_pConsolePanel->ColorPrint(msg.origin->SRCColor, ("[" + name + "]").c_str());
-	(*g_pSourceGameConsole)->m_pConsole->m_pConsolePanel->Print(" ");
-	(*g_pSourceGameConsole)->m_pConsole->m_pConsolePanel->ColorPrint(levelColor, ("[" + std::string(level_names[msg.level]) + "]").c_str());
-	(*g_pSourceGameConsole)->m_pConsole->m_pConsolePanel->Print(" ");
-	(*g_pSourceGameConsole)->m_pConsole->m_pConsolePanel->Print(fmt::to_string(formatted).c_str());
+	g_pGameConsole->m_pConsole->m_pConsolePanel->ColorPrint(msg.origin->SRCColor, ("[" + name + "]").c_str());
+	g_pGameConsole->m_pConsole->m_pConsolePanel->Print(" ");
+	g_pGameConsole->m_pConsole->m_pConsolePanel->ColorPrint(levelColor, ("[" + std::string(level_names[msg.level]) + "]").c_str());
+	g_pGameConsole->m_pConsole->m_pConsolePanel->Print(" ");
+	g_pGameConsole->m_pConsole->m_pConsolePanel->Print(fmt::to_string(formatted).c_str());
 }
 
 void SourceConsoleSink::sink_it_(const spdlog::details::log_msg& msg)
@@ -73,9 +73,9 @@ void, __fastcall, (CConsoleDialog* consoleDialog, const char* pCommand))
 // called from sourceinterface.cpp in client createinterface hooks, on GameClientExports001
 void InitialiseConsoleOnInterfaceCreation()
 {
-	(*g_pSourceGameConsole)->Initialize();
+	g_pGameConsole->Initialize();
 	// hook OnCommandSubmitted so we print inputted commands
-	OnCommandSubmittedHook.Dispatch((LPVOID)(*g_pSourceGameConsole)->m_pConsole->m_vtable->OnCommandSubmitted);
+	OnCommandSubmittedHook.Dispatch((LPVOID)g_pGameConsole->m_pConsole->m_vtable->OnCommandSubmitted);
 
 	auto consoleSink = std::make_shared<SourceConsoleSink>();
 	if (g_bSpdLog_UseAnsiColor)
@@ -87,7 +87,7 @@ void InitialiseConsoleOnInterfaceCreation()
 
 ON_DLL_LOAD_CLIENT_RELIESON("client.dll", SourceConsole, ConCommand, (CModule module))
 {
-	g_pSourceGameConsole = new SourceInterface<CGameConsole>("client.dll", "GameConsole004");
+	g_pGameConsole = Sys_GetFactoryPtr("client.dll", "GameConsole004").RCast<CGameConsole*>();
 
 	RegisterConCommand("toggleconsole", ConCommand_toggleconsole, "Show/hide the console.", FCVAR_DONTRECORD);
 	RegisterConCommand("showconsole", ConCommand_showconsole, "Show the console.", FCVAR_DONTRECORD);
diff --git a/primedev/logging/sourceconsole.h b/primedev/logging/sourceconsole.h
index 215dae1a..35cc1723 100644
--- a/primedev/logging/sourceconsole.h
+++ b/primedev/logging/sourceconsole.h
@@ -61,8 +61,6 @@ public:
 	CConsoleDialog* m_pConsole;
 };
 
-extern SourceInterface<CGameConsole>* g_pSourceGameConsole;
-
 // spdlog logger
 class SourceConsoleSink : public CustomSink
 {
-- 
cgit v1.2.3