More VoIP work: treat voip/sv_voip cvars as protocol version numbers.

This commit is contained in:
Ryan C. Gordon 2008-06-02 19:52:13 +00:00
parent 1e4fa5a54c
commit 0403ca2260
3 changed files with 12 additions and 2 deletions

View file

@ -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

View file

@ -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" );

View file

@ -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