r1419 - trunk/code/server

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2008-07-06 16:07:43 -0400 (Sun, 06 Jul 2008)
New Revision: 1419

Modified:
   trunk/code/server/sv_init.c
Log:
Reverted svn revision #1410 to sv_init.c

sv_voip is a protocol version number, not a boolean, so this check is
 reasonable and correct.


Modified: trunk/code/server/sv_init.c
===================================================================
--- trunk/code/server/sv_init.c	2008-07-06 18:58:40 UTC (rev 1418)
+++ trunk/code/server/sv_init.c	2008-07-06 20:07:43 UTC (rev 1419)
@@ -656,6 +656,10 @@
 	sv_pure = Cvar_Get ("sv_pure", "1", CVAR_SYSTEMINFO );
 #if USE_VOIP
 	sv_voip = Cvar_Get ("sv_voip", "1", CVAR_SYSTEMINFO | CVAR_LATCH);
+	if ( (sv_voip->integer < 0) || (sv_voip->integer > 1) ) {
+		Com_Printf("WARNING: sv_voip must be 0 or 1. Setting to 1.");
+		Cvar_Set ("sv_voip", "1");
+	}
 #endif
 	Cvar_Get ("sv_paks", "", CVAR_SYSTEMINFO | CVAR_ROM );
 	Cvar_Get ("sv_pakNames", "", CVAR_SYSTEMINFO | CVAR_ROM );