diff --git a/engine/common/cvar.c b/engine/common/cvar.c index 869b0fed..bb5bd5f6 100644 --- a/engine/common/cvar.c +++ b/engine/common/cvar.c @@ -1189,6 +1189,7 @@ static void Cvar_List_f( void ) for( var = cvar_vars; var; var = var->next ) { char value[MAX_VA_STRING]; + char *p; if( var->name[0] == '@' ) continue; // never shows system cvars @@ -1196,7 +1197,9 @@ static void Cvar_List_f( void ) if( match && !Q_strnicmpext( match, var->name, matchlen )) continue; - if( Q_colorstr( var->string )) + p = Q_strchr( var->string, '^' ); + + if( IsColorString( p )) Q_snprintf( value, sizeof( value ), "\"%s\"", var->string ); else Q_snprintf( value, sizeof( value ), "\"^2%s^7\"", var->string ); diff --git a/public/crtlib.c b/public/crtlib.c index 989ad243..8455aa19 100644 --- a/public/crtlib.c +++ b/public/crtlib.c @@ -33,26 +33,6 @@ void Q_strnlwr( const char *in, char *out, size_t size_out ) out[i] = Q_tolower( out[i] ); } -size_t Q_colorstr( const char *string ) -{ - const char *p = string; - size_t len = 0; - - if( !string ) - return len; - - while(( p = Q_strchr( p, '^' ))) - { - if( IsColorString( p )) - { - len += 2; - p += 2; - } - } - - return len; -} - int Q_atoi_hex( int sign, const char *str ) { int c, val = 0; diff --git a/public/crtlib.h b/public/crtlib.h index 0f6f98c5..36b9aedc 100644 --- a/public/crtlib.h +++ b/public/crtlib.h @@ -70,7 +70,6 @@ extern const char *g_buildbranch; // void Q_strnlwr( const char *in, char *out, size_t size_out ); #define Q_strlen( str ) (( str ) ? strlen(( str )) : 0 ) -size_t Q_colorstr( const char *string ); int Q_atoi_hex( int sign, const char *str ); int Q_atoi( const char *str ); float Q_atof( const char *str );