r1410 - in trunk/code: qcommon server

[DONOTREPLY at icculus.org]

Author: tma
Date: 2008-07-05 21:35:01 -0400 (Sat, 05 Jul 2008)
New Revision: 1410

Modified:
   trunk/code/qcommon/common.c
   trunk/code/server/sv_init.c
   trunk/code/server/sv_main.c
Log:
* Remove silly range check on sv_voip during initialisation
* Changed dedicated binary dedicated cvar to CVAR_INIT and remove runtime check


Modified: trunk/code/qcommon/common.c
===================================================================
--- trunk/code/qcommon/common.c	2008-07-06 01:30:42 UTC (rev 1409)
+++ trunk/code/qcommon/common.c	2008-07-06 01:35:01 UTC (rev 1410)
@@ -2561,7 +2561,7 @@
 
   // get dedicated here for proper hunk megs initialization
 #ifdef DEDICATED
-	com_dedicated = Cvar_Get ("dedicated", "1", CVAR_LATCH);
+	com_dedicated = Cvar_Get ("dedicated", "1", CVAR_INIT);
 #else
 	com_dedicated = Cvar_Get ("dedicated", "0", CVAR_LATCH);
 #endif

Modified: trunk/code/server/sv_init.c
===================================================================
--- trunk/code/server/sv_init.c	2008-07-06 01:30:42 UTC (rev 1409)
+++ trunk/code/server/sv_init.c	2008-07-06 01:35:01 UTC (rev 1410)
@@ -656,10 +656,6 @@
 	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 );

Modified: trunk/code/server/sv_main.c
===================================================================
--- trunk/code/server/sv_main.c	2008-07-06 01:30:42 UTC (rev 1409)
+++ trunk/code/server/sv_main.c	2008-07-06 01:35:01 UTC (rev 1410)
@@ -782,14 +782,6 @@
 		return;
 	}
 
-#ifdef DEDICATED
-	if( com_dedicated->integer == 0 )
-	{
-		Com_Printf( "WARNING: dedicated must not be 0. Setting to 1.\n" );
-		Cvar_Set( "dedicated", "1" );
-	}
-#endif
-
 	if (!com_sv_running->integer)
 	{
 		// Running as a server, but no map loaded