From c02dc7f71d5435107763dc3354c9cb59d7bdd66f Mon Sep 17 00:00:00 2001
From: Michael McKoy <ferret99gt@gmail.com>
Date: Sun, 23 Dec 2007 00:47:49 +0000
Subject: [PATCH] Changed the convar change hook for sv_alltalk to enforce
 sm_deadtalk correctly

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401824
---
 plugins/basecomm.sp | 43 ++++++++++++++-----------------------------
 1 file changed, 14 insertions(+), 29 deletions(-)

diff --git a/plugins/basecomm.sp b/plugins/basecomm.sp
index d081d920..5636dbc3 100644
--- a/plugins/basecomm.sp
+++ b/plugins/basecomm.sp
@@ -156,46 +156,31 @@ public Action:Command_Say(client, args)
 
 public ConVarChange_Alltalk(Handle:convar, const String:oldValue[], const String:newValue[])
 {
-	if (StringToInt(newValue) != 0
-		|| StringToInt(oldValue) == 0)
-	{
-		return;
-	}
+	new mode = GetConVarInt(g_Cvar_Deadtalk);
+	new maxClients = GetMaxClients();
 	
-	new dt_val = GetConVarInt(g_Cvar_Deadtalk);
-	new max_clients = GetMaxClients();
-	
-	for (new i = 1; i <= max_clients; i++)
+	for (new i = 1; i <= maxClients; i++)
 	{
 		if (!IsClientInGame(i))
 		{
 			continue;
 		}
 		
-		PrintToServer("STAT (i %d) (g_Muted[%d] %d) (dt_val %d)", i, i, g_Muted[i], dt_val);
-		
-		if (IsPlayerAlive(i))
+		if (g_Muted[i])
 		{
-			if (g_Muted[i])
-			{
-				SetClientListeningFlags(i, VOICE_MUTED);
-			}
-			else
-			{
-				SetClientListeningFlags(i, VOICE_NORMAL);
-			}
+			SetClientListeningFlags(i, VOICE_MUTED);
+		}
+		else if (GetConVarBool(g_Cvar_Alltalk))
+		{
+			SetClientListeningFlags(i, VOICE_NORMAL);
 		}
 		else
 		{
-			if (g_Muted[i])
-			{
-				SetClientListeningFlags(i, VOICE_MUTED);
-			}
-			else if (dt_val == 1)
+			if (mode == 1)
 			{
 				SetClientListeningFlags(i, VOICE_LISTENALL);
 			}
-			else if (dt_val == 2)
+			else if (mode == 2)
 			{
 				SetClientListeningFlags(i, VOICE_TEAM);
 			}
@@ -233,12 +218,12 @@ public Event_PlayerDeath(Handle:event, const String:name[], bool:dontBroadcast)
 		return;
 	}
 	
-	new dt_val = GetConVarInt(g_Cvar_Deadtalk);
-	if (dt_val == 1)
+	new mode = GetConVarInt(g_Cvar_Deadtalk);
+	if (mode == 1)
 	{
 		SetClientListeningFlags(client, VOICE_LISTENALL);
 	}
-	else if (dt_val == 2)
+	else if (mode == 2)
 	{
 		SetClientListeningFlags(client, VOICE_TEAM);
 	}