diff options
| author | Tim Angus <tim@ngus.net> | 2016-04-09 17:57:28 +0100 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2016-04-09 17:57:28 +0100 |
| commit | f45fbef604e05144057dec8d1dbfc5d4f5a2a822 (patch) | |
| tree | 152d2a428b078f7a89756ea9e156695fc69f1686 /src/server/sv_init.c | |
| parent | 7f9e97d611b4b267d9dd913144cb9632f96c90c2 (diff) | |
| parent | 87abdd914988724e164ffb16380ad26be8420b84 (diff) | |
Merge branch 'master' into gpp
Diffstat (limited to 'src/server/sv_init.c')
| -rw-r--r-- | src/server/sv_init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/sv_init.c b/src/server/sv_init.c index 3fde62ef..8b8db8f7 100644 --- a/src/server/sv_init.c +++ b/src/server/sv_init.c @@ -646,8 +646,9 @@ void SV_Init (void) sv_serverid = Cvar_Get ("sv_serverid", "0", CVAR_SYSTEMINFO | CVAR_ROM ); sv_pure = Cvar_Get ("sv_pure", "1", CVAR_SYSTEMINFO ); #ifdef USE_VOIP - sv_voip = Cvar_Get("sv_voip", "1", CVAR_SYSTEMINFO | CVAR_LATCH); + sv_voip = Cvar_Get("sv_voip", "1", CVAR_LATCH); Cvar_CheckRange(sv_voip, 0, 1, qtrue); + sv_voipProtocol = Cvar_Get("sv_voipProtocol", sv_voip->integer ? "opus" : "", CVAR_SYSTEMINFO | CVAR_ROM ); #endif Cvar_Get ("sv_paks", "", CVAR_SYSTEMINFO | CVAR_ROM ); Cvar_Get ("sv_pakNames", "", CVAR_SYSTEMINFO | CVAR_ROM ); |