From 5b5deb14a64a7d5bfd8435345bf3054ce30e4c8b Mon Sep 17 00:00:00 2001
From: Hanicef <gustaf@hanicef.me>
Date: Fri, 9 Feb 2024 18:34:34 +0100
Subject: [PATCH] Refine text messages when muting players
---
src/hu_stuff.c | 6 ++++--
src/netcode/d_netcmd.c | 10 ++++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index bdafe4112c..09622b28c6 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -1565,7 +1565,6 @@ static void HU_DrawChat(void)
INT32 cflag = 0;
const char *ntalk = "Say: ", *ttalk = "Team: ";
const char *talk = ntalk;
- const char *mute = "Chat has been muted.";
#ifdef NETSPLITSCREEN
if (splitscreen)
@@ -1592,7 +1591,10 @@ static void HU_DrawChat(void)
if (CHAT_MUTE)
{
- talk = mute;
+ if (cv_mute.value)
+ talk = "Chat has been muted.";
+ else
+ talk = "You have been muted.";
typelines = 1;
cflag = V_GRAYMAP; // set text in gray if chat is muted.
}
diff --git a/src/netcode/d_netcmd.c b/src/netcode/d_netcmd.c
index a07620b1c1..79ce7e47c8 100644
--- a/src/netcode/d_netcmd.c
+++ b/src/netcode/d_netcmd.c
@@ -2557,11 +2557,17 @@ static void Got_MutePlayer(UINT8 **cp, INT32 playernum)
if (!players[player].muted && muted)
{
- CONS_Printf(M_GetText("%s has been muted.\n"), player_names[player]);
+ if (player == consoleplayer)
+ CONS_Printf(M_GetText("You has been muted.\n"));
+ else
+ CONS_Printf(M_GetText("%s has been muted.\n"), player_names[player]);
}
else if (players[player].muted && !muted)
{
- CONS_Printf(M_GetText("%s is no longer muted.\n"), player_names[player]);
+ if (player == consoleplayer)
+ CONS_Printf(M_GetText("You are no longer muted.\n"));
+ else
+ CONS_Printf(M_GetText("%s is no longer muted.\n"), player_names[player]);
}
players[player].muted = muted;
--
GitLab