From 42ccedefef061747ea4e1afeab32e9bf5c0e40ee Mon Sep 17 00:00:00 2001
From: Federico Cecchetto <fedecek3@gmail.com>
Date: Sun, 6 Mar 2022 01:39:03 +0100
Subject: [PATCH] Improve text chat

---
 src/client/component/chat.cpp    | 54 ++++++++++++++++++++++++++++++++
 src/client/component/patches.cpp |  3 --
 2 files changed, 54 insertions(+), 3 deletions(-)
 create mode 100644 src/client/component/chat.cpp

diff --git a/src/client/component/chat.cpp b/src/client/component/chat.cpp
new file mode 100644
index 00000000..b3af7710
--- /dev/null
+++ b/src/client/component/chat.cpp
@@ -0,0 +1,54 @@
+#include <std_include.hpp>
+#include "loader/component_loader.hpp"
+
+#include "localized_strings.hpp"
+#include "dvars.hpp"
+
+#include "game/game.hpp"
+#include "game/dvars.hpp"
+
+#include <utils/nt.hpp>
+#include <utils/hook.hpp>
+#include <utils/flags.hpp>
+
+namespace chat
+{
+	namespace
+	{
+		game::Font_s* ui_get_font_handle_stub()
+		{
+			return game::R_RegisterFont("fonts/defaultBold.otf", 24);
+		}
+	}
+
+	class component final : public component_interface
+	{
+	public:
+		void post_unpack() override
+		{
+			if (!game::environment::is_mp())
+			{
+				return;
+			}
+
+			// use better font
+			utils::hook::call(0x1400AA831, ui_get_font_handle_stub);
+			utils::hook::call(0x14024800C, ui_get_font_handle_stub);
+			utils::hook::call(0x14024F573, ui_get_font_handle_stub);
+
+			// set text style to 0 (non-blurry)
+			utils::hook::set<uint8_t>(0x14024F5DD, 0);
+			utils::hook::set<uint8_t>(0x1400AAA1C, 0);
+			utils::hook::set<uint8_t>(0x14024802E, 0);
+
+			localized_strings::override("EXE_SAY", "^3Match^7");
+			localized_strings::override("EXE_SAYTEAM", "^5Team^7");
+
+			// move chat position on the screen above menu splashes
+			dvars::override::register_vec2("cg_hudChatPosition", 5, 200, 0, 640, game::DVAR_FLAG_SAVED);
+			dvars::override::register_int("cg_chatHeight", 5, 0, 8, game::DVAR_FLAG_SAVED);
+		}
+	};
+}
+
+REGISTER_COMPONENT(chat::component)
diff --git a/src/client/component/patches.cpp b/src/client/component/patches.cpp
index f90f0375..d5392095 100644
--- a/src/client/component/patches.cpp
+++ b/src/client/component/patches.cpp
@@ -252,9 +252,6 @@ namespace patches
 			dvars::override::register_int("safeArea_horizontal", 1, 0, 1, game::DVAR_FLAG_SAVED);
 			dvars::override::register_int("safeArea_vertical", 1, 0, 1, game::DVAR_FLAG_SAVED);
 
-			// move chat position on the screen above menu splashes
-			dvars::override::register_vec2("cg_hudChatPosition", 5, 170, 0, 640, game::DVAR_FLAG_SAVED);
-
 			// allow servers to check for new packages more often
 			dvars::override::register_int("sv_network_fps", 1000, 20, 1000, game::DVAR_FLAG_SAVED);