aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoricculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-06-29 04:04:33 +0000
committericculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-06-29 04:04:33 +0000
commit748f3ca37deb646667b732c92954bf7ef92e45b9 (patch)
tree59293770d8c1cbb779348679daa905c2974171bf
parent6f4ff406892b15977e5624f669d2fee42eb9ae62 (diff)
downloadioquake3-aero-748f3ca37deb646667b732c92954bf7ef92e45b9.tar.gz
ioquake3-aero-748f3ca37deb646667b732c92954bf7ef92e45b9.zip
Don't show VoIP meter in all the common scenarios.
git-svn-id: svn://svn.icculus.org/quake3/trunk@1399 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/client/cl_scrn.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/code/client/cl_scrn.c b/code/client/cl_scrn.c
index f3e6faf..dd9b5c1 100644
--- a/code/client/cl_scrn.c
+++ b/code/client/cl_scrn.c
@@ -354,10 +354,19 @@ void SCR_DrawVoipMeter( void ) {
int limit, i;
if (!cl_voipShowMeter->integer)
- return;
-
- if (!cl_voipSend->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.
limit = (int) (clc.voipPower * 10.0f);
if (limit > 10)