* Remove silly range check on sv_voip during initialisation

* Changed dedicated binary dedicated cvar to CVAR_INIT and remove runtime check
This commit is contained in:
Tim Angus 2008-07-06 01:35:01 +00:00
parent b601941240
commit 6b572920a9
3 changed files with 1 additions and 13 deletions

View file

@ -2561,7 +2561,7 @@ void Com_Init( char *commandLine ) {
// get dedicated here for proper hunk megs initialization // get dedicated here for proper hunk megs initialization
#ifdef DEDICATED #ifdef DEDICATED
com_dedicated = Cvar_Get ("dedicated", "1", CVAR_LATCH); com_dedicated = Cvar_Get ("dedicated", "1", CVAR_INIT);
#else #else
com_dedicated = Cvar_Get ("dedicated", "0", CVAR_LATCH); com_dedicated = Cvar_Get ("dedicated", "0", CVAR_LATCH);
#endif #endif

View file

@ -656,10 +656,6 @@ void SV_Init (void) {
sv_pure = Cvar_Get ("sv_pure", "1", CVAR_SYSTEMINFO ); sv_pure = Cvar_Get ("sv_pure", "1", CVAR_SYSTEMINFO );
#if USE_VOIP #if USE_VOIP
sv_voip = Cvar_Get ("sv_voip", "1", CVAR_SYSTEMINFO | CVAR_LATCH); 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 #endif
Cvar_Get ("sv_paks", "", CVAR_SYSTEMINFO | CVAR_ROM ); Cvar_Get ("sv_paks", "", CVAR_SYSTEMINFO | CVAR_ROM );
Cvar_Get ("sv_pakNames", "", CVAR_SYSTEMINFO | CVAR_ROM ); Cvar_Get ("sv_pakNames", "", CVAR_SYSTEMINFO | CVAR_ROM );

View file

@ -782,14 +782,6 @@ void SV_Frame( int msec ) {
return; 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) if (!com_sv_running->integer)
{ {
// Running as a server, but no map loaded // Running as a server, but no map loaded