3 files changed, 64 insertions, 0 deletions
diff --git a/NorthstarDLL/dedicated/dedicated.cpp b/NorthstarDLL/dedicated/dedicated.cpp
index 267fbe92..1aff0f34 100644
--- a/NorthstarDLL/dedicated/dedicated.cpp
+++ b/NorthstarDLL/dedicated/dedicated.cpp
@@ -1,4 +1,5 @@
 #include "dedicated.h"
+#include "dedicatedlogtoclient.h"
 #include "core/tier0.h"
 #include "playlist.h"
 #include "engine/r2engine.h"
@@ -226,6 +227,9 @@ ON_DLL_LOAD_DEDI_RELIESON("engine.dll", DedicatedServer, ServerPresence, (CModul
 	DedicatedConsoleServerPresence* presenceReporter = new DedicatedConsoleServerPresence;
 	g_pServerPresence->AddPresenceReporter(presenceReporter);
 
+	// setup dedicated printing to client
+	RegisterCustomSink(std::make_shared<DedicatedServerLogToClientSink>());
+
 	// Disable Quick Edit mode to reduce chance of user unintentionally hanging their server by selecting something.
 	if (!Tier0::CommandLine()->CheckParm("-bringbackquickedit"))
 	{
diff --git a/NorthstarDLL/dedicated/dedicatedlogtoclient.cpp b/NorthstarDLL/dedicated/dedicatedlogtoclient.cpp
new file mode 100644
index 00000000..bb62cb36
--- /dev/null
+++ b/NorthstarDLL/dedicated/dedicatedlogtoclient.cpp
@@ -0,0 +1,49 @@
+#include "pch.h"
+#include "dedicatedlogtoclient.h"
+#include "engine/r2engine.h"
+
+void (*CGameClient__ClientPrintf)(R2::CBaseClient* pClient, const char* fmt, ...);
+
+void DedicatedServerLogToClientSink::custom_sink_it_(const custom_log_msg& msg)
+{
+	if (*R2::g_pServerState == R2::server_state_t::ss_dead)
+		return;
+
+	enum class eSendPrintsToClient
+	{
+		NONE = -1,
+		FIRST,
+		ALL
+	};
+
+	static const ConVar* Cvar_dedi_sendPrintsToClient = R2::g_pCVar->FindVar("dedi_sendPrintsToClient");
+	eSendPrintsToClient eSendPrints = static_cast<eSendPrintsToClient>(Cvar_dedi_sendPrintsToClient->GetInt());
+	if (eSendPrints == eSendPrintsToClient::NONE)
+		return;
+
+	std::string sLogMessage = fmt::format("[DEDICATED SERVER] [{}] {}", level_names[msg.level], msg.payload);
+	for (int i = 0; i < R2::g_pGlobals->m_nMaxClients; i++)
+	{
+		R2::CBaseClient* pClient = &R2::g_pClientArray[i];
+
+		if (pClient->m_Signon >= R2::eSignonState::CONNECTED)
+		{
+			CGameClient__ClientPrintf(pClient, sLogMessage.c_str());
+
+			if (eSendPrints == eSendPrintsToClient::FIRST)
+				break;
+		}
+	}
+}
+
+void DedicatedServerLogToClientSink::sink_it_(const spdlog::details::log_msg& msg)
+{
+	throw std::runtime_error("sink_it_ called on DedicatedServerLogToClientSink with pure log_msg. This is an error!");
+}
+
+void DedicatedServerLogToClientSink::flush_() {}
+
+ON_DLL_LOAD_DEDI("engine.dll", DedicatedServerLogToClient, (CModule module))
+{
+	CGameClient__ClientPrintf = module.Offset(0x1016A0).As<void (*)(R2::CBaseClient*, const char*, ...)>();
+}
diff --git a/NorthstarDLL/dedicated/dedicatedlogtoclient.h b/NorthstarDLL/dedicated/dedicatedlogtoclient.h
new file mode 100644
index 00000000..16f1e584
--- /dev/null
+++ b/NorthstarDLL/dedicated/dedicatedlogtoclient.h
@@ -0,0 +1,11 @@
+#pragma once
+#include "logging/logging.h"
+#include "core/convar/convar.h"
+
+class DedicatedServerLogToClientSink : public CustomSink
+{
+  protected:
+	void custom_sink_it_(const custom_log_msg& msg);
+	void sink_it_(const spdlog::details::log_msg& msg) override;
+	void flush_() override;
+};