From 21786610d70ba4ed374612ace09d6c8be135b452 Mon Sep 17 00:00:00 2001
From: Eidolon <furyhunter600@gmail.com>
Date: Wed, 17 Sep 2025 18:11:30 -0500
Subject: [PATCH] Don't draw voice indicators on score unless voice is enabled
 on server

---
 src/k_hud.cpp   | 27 ++++++++++++++-------------
 src/k_vote.c    |  2 +-
 src/y_inter.cpp |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/k_hud.cpp b/src/k_hud.cpp
index c2a68bc9d..55cb39dab 100644
--- a/src/k_hud.cpp
+++ b/src/k_hud.cpp
@@ -8232,21 +8232,22 @@ void K_drawKartHUD(void)
 	}
 
 	// TODO better voice chat speaking indicator integration for spectators
-	{
-		char speakingstring[2048];
-		memset(speakingstring, 0, sizeof(speakingstring));
+	// Just kidding spectator voice is disabled in-level anyway
+	// {
+	// 	char speakingstring[2048];
+	// 	memset(speakingstring, 0, sizeof(speakingstring));
 
-		for (int i = 0; i < MAXPLAYERS; i++)
-		{
-			if (playeringame[i] && players[i].spectator && S_IsPlayerVoiceActive(i))
-			{
-				strcat(speakingstring, player_names[i]);
-				strcat(speakingstring, " ");
-			}
-		}
+	// 	for (int i = 0; i < MAXPLAYERS; i++)
+	// 	{
+	// 		if (netgame && cv_voice_allowservervoice.value && playeringame[i] && players[i].spectator && S_IsPlayerVoiceActive(i))
+	// 		{
+	// 			strcat(speakingstring, player_names[i]);
+	// 			strcat(speakingstring, " ");
+	// 		}
+	// 	}
 
-		V_DrawThinString(0, 0, V_SNAPTOTOP|V_SNAPTOLEFT, speakingstring);
-	}
+	// 	V_DrawThinString(0, 0, V_SNAPTOTOP|V_SNAPTOLEFT, speakingstring);
+	// }
 
 	// Draw the countdowns after everything else.
 	if (stplyr->lives <= 0 && stplyr->playerstate == PST_DEAD)
diff --git a/src/k_vote.c b/src/k_vote.c
index 13ce0b22e..ae2b9785c 100644
--- a/src/k_vote.c
+++ b/src/k_vote.c
@@ -1209,7 +1209,7 @@ void Y_VoteDrawer(void)
 
 		for (int i = 0; i < MAXPLAYERS; i++)
 		{
-			if (S_IsPlayerVoiceActive(i))
+			if (netgame && cv_voice_allowservervoice.value && S_IsPlayerVoiceActive(i))
 			{
 				strcat(speakingstring, player_names[i]);
 				strcat(speakingstring, " ");
diff --git a/src/y_inter.cpp b/src/y_inter.cpp
index a613cf3ff..b25e9d486 100644
--- a/src/y_inter.cpp
+++ b/src/y_inter.cpp
@@ -793,7 +793,7 @@ void Y_PlayerStandingsDrawer(y_data_t *standings, INT32 xoffset)
 				player_names[pnum]
 			);
 
-			if (netgame)
+			if (netgame && cv_voice_allowservervoice.value)
 			{
 				patch_t *voxpat;
 				int voxxoffs = 0;