aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-07-06 01:35:01 +0000
committertma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea>2008-07-06 01:35:01 +0000
commit59a6bcfe64b4d4f61f1d0c4ee8dc5e83c486f2c7 (patch)
treeb581283591a7881beefeac1f8d13c73657fa982f
parentea34e6946550b6326f82d010623486e9836315a1 (diff)
downloadioquake3-aero-59a6bcfe64b4d4f61f1d0c4ee8dc5e83c486f2c7.tar.gz
ioquake3-aero-59a6bcfe64b4d4f61f1d0c4ee8dc5e83c486f2c7.zip
* Remove silly range check on sv_voip during initialisation
* Changed dedicated binary dedicated cvar to CVAR_INIT and remove runtime check git-svn-id: svn://svn.icculus.org/quake3/trunk@1410 edf5b092-35ff-0310-97b2-ce42778d08ea
-rw-r--r--code/qcommon/common.c2
-rw-r--r--code/server/sv_init.c4
-rw-r--r--code/server/sv_main.c8
3 files changed, 1 insertions, 13 deletions
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index d186455..f100b82 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -2561,7 +2561,7 @@ void Com_Init( char *commandLine ) {
// 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
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 97154f0..28b3a1d 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -656,10 +656,6 @@ void SV_Init (void) {
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 );
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index e17bd6a..667db41 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -782,14 +782,6 @@ void SV_Frame( int msec ) {
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