r1399 - trunk/code/client

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2008-06-29 00:04:33 -0400 (Sun, 29 Jun 2008)
New Revision: 1399

Modified:
   trunk/code/client/cl_scrn.c
Log:
Don't show VoIP meter in all the common scenarios.


Modified: trunk/code/client/cl_scrn.c
===================================================================
--- trunk/code/client/cl_scrn.c	2008-06-25 07:59:57 UTC (rev 1398)
+++ trunk/code/client/cl_scrn.c	2008-06-29 04:04:33 UTC (rev 1399)
@@ -354,11 +354,20 @@
 	int limit, i;
 
 	if (!cl_voipShowMeter->integer)
-		return;
+		return;  // player doesn't want to show meter at all.
+	else if (!cl_voipSend->integer)
+		return;  // not recording at the moment.
+	else if (cls.state != CA_ACTIVE)
+		return;  // not connected to a server.
+	else if (!cl_connectedToVoipServer)
+		return;  // server doesn't support VoIP.
+	else if ( Cvar_VariableValue( "g_gametype" ) == GT_SINGLE_PLAYER || Cvar_VariableValue("ui_singlePlayerActive"))
+		return;  // single player game.
+	else if (clc.demoplaying)
+		return ;  // playing back a demo.
+	else if (!voip->integer)
+		return;  // client has VoIP support disabled.
 
-	if (!cl_voipSend->integer)
-		return;
-
 	limit = (int) (clc.voipPower * 10.0f);
 	if (limit > 10)
 		limit = 10;