diff options
| author | icculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-06-02 19:52:13 +0000 |
|---|---|---|
| committer | icculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-06-02 19:52:13 +0000 |
| commit | b7d4ef98b10aad87a1a69bdd4081b5b585c9fe9e (patch) | |
| tree | 424231db4b4fa5a64240e7ca0e91e61a428c46ca /code | |
| parent | 54a42296270247b1b1bfb1f576fe67106eb86d03 (diff) | |
| download | ioquake3-aero-b7d4ef98b10aad87a1a69bdd4081b5b585c9fe9e.tar.gz ioquake3-aero-b7d4ef98b10aad87a1a69bdd4081b5b585c9fe9e.zip | |
More VoIP work: treat voip/sv_voip cvars as protocol version numbers.
git-svn-id: svn://svn.icculus.org/quake3/trunk@1358 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code')
| -rw-r--r-- | code/client/cl_main.c | 6 | ||||
| -rw-r--r-- | code/client/cl_parse.c | 4 | ||||
| -rw-r--r-- | code/server/sv_client.c | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/code/client/cl_main.c b/code/client/cl_main.c index 1a265e7..34185b9 100644 --- a/code/client/cl_main.c +++ b/code/client/cl_main.c @@ -3037,6 +3037,12 @@ void CL_Init( void ) { cl_voipGainDuringCapture = Cvar_Get ("cl_voipGainDuringCapture", "0.2", CVAR_ARCHIVE); voip = Cvar_Get ("voip", "0", CVAR_USERINFO | CVAR_ARCHIVE | CVAR_LATCH); + // This is a protocol version number. + if ( (voip->integer < 0) || (voip->integer > 1) ) { + Com_Printf("WARNING: voip cvar must be 0 or 1. Setting to 1."); + Cvar_Set ("voip", "1"); + } + // If your data rate is too low, you'll get Connection Interrupted warnings // when VoIP packets arrive, even if you have a broadband connection. // This might work on rates lower than 25000, but for safety's sake, we'll diff --git a/code/client/cl_parse.c b/code/client/cl_parse.c index 167b035..d80d7d2 100644 --- a/code/client/cl_parse.c +++ b/code/client/cl_parse.c @@ -365,8 +365,10 @@ void CL_SystemInfoChanged( void ) { } #if USE_VOIP + // in the future, (val) will be a protocol version string, so only + // accept explicitly 1, not generally non-zero. s = Info_ValueForKey( systemInfo, "sv_voip" ); - cl_connectedToVoipServer = atoi( s ); + cl_connectedToVoipServer = (atoi( s ) == 1); #endif s = Info_ValueForKey( systemInfo, "sv_cheats" ); diff --git a/code/server/sv_client.c b/code/server/sv_client.c index 6f932d1..2528e64 100644 --- a/code/server/sv_client.c +++ b/code/server/sv_client.c @@ -1371,8 +1371,10 @@ void SV_UserinfoChanged( client_t *cl ) { } #if USE_VOIP + // in the future, (val) will be a protocol version string, so only + // accept explicitly 1, not generally non-zero. val = Info_ValueForKey (cl->userinfo, "voip"); - cl->hasVoip = (strlen(val) && atoi(val)) ? qtrue : qfalse; + cl->hasVoip = (atoi(val) == 1) ? qtrue : qfalse; #endif // TTimo |