Logging improvements + Colours (new) (#320)

* log colours :)

* commend the freopen stuff (it causes problems)

* formatting

* add explanatory comment

* gaming maybe

* move set pattern

* ok this works now i think

* trailing space :)

* Revert "Merge branch 'main' into log-colours"

This reverts commit d40b6496b7bd3b3f20f51cc2311b0369aeabe735, reversing
changes made to a98bcc22e8961b325806f6a9ca85e64353fd574c.

* Revert "Revert "Merge branch 'main' into log-colours""

This reverts commit da792245b1cd7d0ac9e22d5633770142a43ce10c.

* fix shit maybe

* fix shit but better

* initial, still WIP

* Add GetContextName_Short

* colours for in game console

* working, time to improve code

* rename var + add a colour or two

* whoops

* change rpak filesystem to RP NATIVE

* add RP NATIVE and NORTHSTAR tags

* clang-format off because formatting

* formatting 2

* formatting 3: the formattening

* bruh

* revert unnecessary change

* improve comment

* Set console title to show profile

* pain

* Made code not shit

* Formatting and remove warning box

* Update main.cpp

* Formatting

* More format changes

* Again

* Fix small things from code review

* Remove empty line

* renamed NATIVE_EN -> NATIVE_ENGINE

* Update logging.cpp

* Update sourceconsole.cpp

Co-authored-by: ASpoonPlaysGames <66967891+ASpoonPlaysGames@users.noreply.github.com>

1 files changed, 9 insertions, 32 deletions

diff --git a/NorthstarDLL/sourceconsole.h b/NorthstarDLL/sourceconsole.h
index e811f523..b22ef2d3 100644
--- a/NorthstarDLL/sourceconsole.h
+++ b/NorthstarDLL/sourceconsole.h
@@ -11,30 +11,6 @@ class EditablePanel
 	unsigned char unknown[0x2B0];
 };
 
-struct SourceColor
-{
-	unsigned char R;
-	unsigned char G;
-	unsigned char B;
-	unsigned char A;
-
-	SourceColor(unsigned char r, unsigned char g, unsigned char b, unsigned char a)
-	{
-		R = r;
-		G = g;
-		B = b;
-		A = a;
-	}
-
-	SourceColor()
-	{
-		R = 0;
-		G = 0;
-		B = 0;
-		A = 0;
-	}
-};
-
 class IConsoleDisplayFunc
 {
   public:
@@ -89,19 +65,20 @@ class CGameConsole
 extern SourceInterface<CGameConsole>* g_pSourceGameConsole;
 
 // spdlog logger
-class SourceConsoleSink : public spdlog::sinks::base_sink<std::mutex>
+class SourceConsoleSink : public CustomSink
 {
   private:
 	std::map<spdlog::level::level_enum, SourceColor> m_LogColours = {
-		{spdlog::level::trace, SourceColor(0, 255, 255, 255)},
-		{spdlog::level::debug, SourceColor(0, 255, 255, 255)},
-		{spdlog::level::info, SourceColor(255, 255, 255, 255)},
-		{spdlog::level::warn, SourceColor(255, 255, 0, 255)},
-		{spdlog::level::err, SourceColor(255, 0, 0, 255)},
-		{spdlog::level::critical, SourceColor(255, 0, 0, 255)},
-		{spdlog::level::off, SourceColor(0, 0, 0, 0)}};
+		{spdlog::level::trace, NS::Colors::TRACE.ToSourceColor()},
+		{spdlog::level::debug, NS::Colors::DEBUG.ToSourceColor()},
+		{spdlog::level::info, NS::Colors::INFO.ToSourceColor()},
+		{spdlog::level::warn, NS::Colors::WARN.ToSourceColor()},
+		{spdlog::level::err, NS::Colors::ERR.ToSourceColor()},
+		{spdlog::level::critical, NS::Colors::CRIT.ToSourceColor()},
+		{spdlog::level::off, NS::Colors::OFF.ToSourceColor()}};
 
   protected:
+	void custom_sink_it_(const custom_log_msg& msg);
 	void sink_it_(const spdlog::details::log_msg& msg) override;
 	void flush_() override;
 };