diff options
| author | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-07-07 22:31:39 +0000 |
|---|---|---|
| committer | tma <tma@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2008-07-07 22:31:39 +0000 |
| commit | 80e25417be92abff3053a4d8f209349a16e6d334 (patch) | |
| tree | 1058d52d8de3d7115cf5b018e00408b0db8c5341 /code/qcommon/common.c | |
| parent | afbf4dd0c3999e58f59b3d4e3dd4b93d6abe8fd0 (diff) | |
| download | ioquake3-aero-80e25417be92abff3053a4d8f209349a16e6d334.tar.gz ioquake3-aero-80e25417be92abff3053a4d8f209349a16e6d334.zip | |
* Rename voip cvar to cl_voip
* s/#if USE_VOIP/#ifdef USE_VOIP/
* Add generalised runtime cvar range checking, currently on [sv|cl]_voip,
dedicated and a bunch of r_ variables
git-svn-id: svn://svn.icculus.org/quake3/trunk@1420 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/qcommon/common.c')
| -rw-r--r-- | code/qcommon/common.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/code/qcommon/common.c b/code/qcommon/common.c index f100b82..5888592 100644 --- a/code/qcommon/common.c +++ b/code/qcommon/common.c @@ -473,10 +473,12 @@ qboolean Com_AddStartupCommands( void ) { continue; } - // set commands won't override menu startup - if ( Q_stricmpn( com_consoleLines[i], "set", 3 ) ) { - added = qtrue; + // set commands already added with Com_StartupVariable + if ( !Q_stricmpn( com_consoleLines[i], "set", 3 ) ) { + continue; } + + added = qtrue; Cbuf_AddText( com_consoleLines[i] ); Cbuf_AddText( "\n" ); } @@ -2562,8 +2564,10 @@ void Com_Init( char *commandLine ) { // get dedicated here for proper hunk megs initialization #ifdef DEDICATED com_dedicated = Cvar_Get ("dedicated", "1", CVAR_INIT); + Cvar_CheckRange( com_dedicated, 1, 2, qtrue ); #else com_dedicated = Cvar_Get ("dedicated", "0", CVAR_LATCH); + Cvar_CheckRange( com_dedicated, 0, 2, qtrue ); #endif // allocate the stack based hunk allocator Com_InitHunkMemory(); |