cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2024-11-30 07:41:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

print a warning when trying to create a deprecated cvar

Browse source
This commit is contained in:
myT 2018-02-07 06:24:45 +01:00
parent 6cafc76e87
commit 005dd46e08
3 changed files with 57 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/qcommon/common.cpp
View file

@ -2325,6 +2325,8 @@ void Com_Init( char *commandLine )
// make sure single player is off by default
Cvar_Set( "sv_singlePlayer", "0" );
Cvar_PrintDeprecationWarnings();
com_fullyInitialized = qtrue;
Com_Printf ("--- Common Initialization Complete ---\n");

54
code/qcommon/cvar.cpp
View file

@ -28,6 +28,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "common_help.h"
#include <float.h>
struct depCvar_t {
const char* name;
const char* newName;
qbool warned;
};
static cvar_t* cvar_vars;
static cvar_t* cvar_cheats;
int cvar_modifiedFlags;
@ -39,6 +45,16 @@ static int cvar_numIndexes;
#define CVAR_HASH_SIZE 256
static cvar_t* hashTable[CVAR_HASH_SIZE];
static qbool cvar_canPrintWarnings;
static depCvar_t cvar_depVars[] = {
{ "sensitivity", "m_speed" },
{ "r_customwidth", "r_width" },
{ "r_customheight", "r_height" },
{ "r_overBrightBits", "r_brightness" },
{ "r_mapOverBrightBits", "r_mapBrightness" }
};
static long Cvar_Hash( const char* s )
{
@ -209,7 +225,7 @@ static qbool Cvar_IsValidValuePrintWarnings( cvar_t *var, const char *value )
} else {
int i;
if ( sscanf(value, "%d", &i) != 1 )
WARNING("not a whole number (integer)")
WARNING( "not a whole number (integer)" )
if( i < var->validator.i.min )
WARNING( "integer value too low" )
if( i > var->validator.i.max )
@ -230,6 +246,40 @@ static qbool Cvar_IsValidValue( cvar_t *var, const char *value, qbool printWarni
}
static void Cvar_PrintDeprecationWarning( int i )
{
Com_Printf( "^3WARNING: " S_COLOR_CVAR "%s^7 was replaced by " S_COLOR_CVAR "%s\n",
cvar_depVars[i].name, cvar_depVars[i].newName );
}
static qbool Cvar_IsCreationAllowed( const char *var_name )
{
for ( int i = 0; i < ARRAY_LEN(cvar_depVars); ++i ) {
if ( Q_stricmp(var_name, cvar_depVars[i].name) )
continue;
cvar_depVars[i].warned = qtrue;
if ( cvar_canPrintWarnings )
Cvar_PrintDeprecationWarning( i );
return qfalse;
}
return qtrue;
}
void Cvar_PrintDeprecationWarnings()
{
cvar_canPrintWarnings = qtrue;
for ( int i = 0; i < ARRAY_LEN(cvar_depVars); ++i ) {
if ( cvar_depVars[i].warned )
Cvar_PrintDeprecationWarning( i );
}
}
static cvar_t* Cvar_Set2( const char *var_name, const char *value, qbool force )
{
// Com_DPrintf( "Cvar_Set2: %s %s\n", var_name, value );
@ -243,6 +293,8 @@ static cvar_t* Cvar_Set2( const char *var_name, const char *value, qbool force )
if (!var) {
if ( !value )
return NULL;
if( !Cvar_IsCreationAllowed(var_name) )
return NULL;
// create it
return Cvar_Get( var_name, value, force ? 0 : CVAR_USER_CREATED );
}

2
code/qcommon/qcommon.h
View file

@ -514,6 +514,8 @@ cvar_t *Cvar_Get( const char *var_name, const char *value, int flags );
// that allows variables to be unarchived without needing bitflags
// if value is "", the value will not override a previously set value.
void Cvar_PrintDeprecationWarnings();
void Cvar_SetHelp( const char *var_name, const char *help );
qbool Cvar_GetHelp( const char **desc, const char **help, const char* var_name ); // qtrue if the cvar was found