Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

logging: Remove use of SourceInterface for CGameConsole #803

Merged
merged 2 commits into from
Sep 2, 2024
Merged

logging: Remove use of SourceInterface for CGameConsole #803

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f662ca
logging: Remove use of SourceInterface in sourceconsole.cpp
F1F7Y Aug 31, 2024
ef8eec9
numbers, what do they mean
F1F7Y Aug 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions primedev/logging/sourceconsole.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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);
Expand Down
2 changes: 0 additions & 2 deletions primedev/logging/sourceconsole.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ class CGameConsole
CConsoleDialog* m_pConsole;
};

extern SourceInterface<CGameConsole>* g_pSourceGameConsole;

// spdlog logger
class SourceConsoleSink : public CustomSink
{
Expand Down
Loading