From d6db83805dbbb96440769035f372c141f719e33e Mon Sep 17 00:00:00 2001
From: smallmodel <15067410+smallmodel@users.noreply.github.com>
Date: Tue, 7 Jan 2025 00:39:45 +0100
Subject: [PATCH] Make chat message colors brighter

---
 code/client/cl_ui.cpp      | 20 ++++++++++++--------
 code/client/cl_ui.h        | 11 +++++++----
 code/client/cl_uidmbox.cpp | 10 +++-------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/code/client/cl_ui.cpp b/code/client/cl_ui.cpp
index 363723ff..8e1a6b81 100644
--- a/code/client/cl_ui.cpp
+++ b/code/client/cl_ui.cpp
@@ -152,6 +152,10 @@ static str               scoreboard_menuname;
 static str               ui_sCurrentLoadingMenu;
 static Container<Menu *> hudList;
 
+const UColor UWhiteChatMessageColor(0.75, 0.75, 0.75);
+const UColor URedChatMessageColor(1.0, 0.25, 0.25);
+const UColor UGreenChatMessageColor(0.0, 1.0, 0.25, 1.0);
+
 void UI_MultiplayerMenuWidgetsUpdate(void);
 void UI_MultiplayerMainMenuWidgetsUpdate(void);
 void UI_MainMenuWidgetsUpdate(void);
@@ -1303,11 +1307,11 @@ UI_PrintConsole
 */
 void UI_PrintConsole(const char *msg)
 {
-    UColor     *pColor = NULL;
-    const char *pszString;
-    char        szString[1024];
-    char        szBlah[1024];
-    qboolean    bPrintedDMBox = qfalse;
+    const UColor *pColor = NULL;
+    const char   *pszString;
+    char          szString[1024];
+    char          szBlah[1024];
+    qboolean      bPrintedDMBox = qfalse;
 
     pszString = msg;
     strncpy(szString, msg, 1024);
@@ -1325,7 +1329,7 @@ void UI_PrintConsole(const char *msg)
             break;
         case MESSAGE_CHAT_WHITE:
             bDMMessage = qtrue;
-            pColor     = &UGrey;
+            pColor     = &UWhiteChatMessageColor;
             break;
         case MESSAGE_WHITE:
             bBold  = qtrue;
@@ -1333,11 +1337,11 @@ void UI_PrintConsole(const char *msg)
             break;
         case MESSAGE_CHAT_RED:
             bDeathMessage = MESSAGE_CHAT_RED;
-            pColor        = &ULightRed;
+            pColor        = &URedChatMessageColor;
             break;
         case MESSAGE_CHAT_GREEN:
             bDeathMessage = MESSAGE_CHAT_GREEN;
-            pColor        = &UGreen;
+            pColor        = &UGreenChatMessageColor;
             break;
         }
 
diff --git a/code/client/cl_ui.h b/code/client/cl_ui.h
index 60da029e..ab3a001e 100644
--- a/code/client/cl_ui.h
+++ b/code/client/cl_ui.h
@@ -47,10 +47,13 @@ void CL_ShutdownUI(void);
 //
 // general ui stuff
 //
-extern inventory_t client_inv;
-extern bind_t      client_bind;
-extern cvar_t     *cl_greenfps;
-extern qboolean    server_loading;
+extern inventory_t  client_inv;
+extern bind_t       client_bind;
+extern cvar_t      *cl_greenfps;
+extern qboolean     server_loading;
+extern const UColor UWhiteChatMessageColor;
+extern const UColor URedChatMessageColor;
+extern const UColor UGreenChatMessageColor;
 
 const char *CvarGetForUI(const char *name, const char *defval);
 void        UI_ClearState(void);
diff --git a/code/client/cl_uidmbox.cpp b/code/client/cl_uidmbox.cpp
index 5131d83d..87c44e40 100644
--- a/code/client/cl_uidmbox.cpp
+++ b/code/client/cl_uidmbox.cpp
@@ -299,23 +299,19 @@ void UIDMBox::Print(const char *text)
     m_items[m_numitems].flags = 0;
 
     if (*text == MESSAGE_CHAT_WHITE) {
-        m_items[m_numitems].color = UGrey;
+        m_items[m_numitems].color = UWhiteChatMessageColor;
         m_items[m_numitems].font  = m_fontbold;
         m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_BOLD;
 
         text1 = text + 1;
     } else if (*text == MESSAGE_CHAT_RED) {
-        m_items[m_numitems].color = ULightRed;
+        m_items[m_numitems].color = URedChatMessageColor;
         m_items[m_numitems].font  = m_fontbold;
         m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;
 
         text1 = text + 1;
     } else if (*text == MESSAGE_CHAT_GREEN) {
-        if (com_target_game->integer >= TG_MOHTA) {
-            m_items[m_numitems].color = ULightGreen;
-        } else {
-            m_items[m_numitems].color = UGreen;
-        }
+        m_items[m_numitems].color = UGreenChatMessageColor;
         m_items[m_numitems].font = m_fontbold;
         m_items[m_numitems].flags |= DMBOX_ITEM_FLAG_DEATH;