cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2024-11-10 06:31:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed validation for ch_crosshairHitColor and ch_crosshairFragColor

Browse source
This commit is contained in:
myT 2023-11-12 02:20:11 +01:00
parent 457ca2ab65
commit e83e2eb532
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/client/cl_main.cpp
View file

@ -2440,11 +2440,11 @@ static const cvarTableItemCPMA_t cpma_cvars[] =
"Crosshair text", CVARCAT_HUD, "Crosshair uses this text instead of an icon", "" "Crosshair text", CVARCAT_HUD, "Crosshair uses this text instead of an icon", ""
}, },
{ {
"ch_crosshairHitColor", CVART_COLOR_CPMA, "ch_crosshairHitColor", CVART_COLOR_CPMA_E,
"Crosshair hit color", CVARCAT_HUD, "", "" "Crosshair hit color", CVARCAT_HUD, "", ""
}, },
{ {
"ch_crosshairFragColor", CVART_COLOR_CPMA, "ch_crosshairFragColor", CVART_COLOR_CPMA_E,
"Crosshair kill color", CVARCAT_HUD, "", "" "Crosshair kill color", CVARCAT_HUD, "", ""
}, },
{ {

10
code/qcommon/cvar.cpp
View file

@ -247,6 +247,9 @@ static qbool Cvar_IsValidValue( cvar_t *var, const char *value, qboolean printWa
WARNING( "must be a single char" ); WARNING( "must be a single char" );
if ( !IsCPMAColorCode(value[0]) ) if ( !IsCPMAColorCode(value[0]) )
WARNING( "invalid color code, must be [a-zA-Z0-9]" ); WARNING( "invalid color code, must be [a-zA-Z0-9]" );
} else if ( var->type == CVART_COLOR_CPMA_E ) {
if ( value[0] != '\0' && !IsCPMAColorCode(value[0]) )
WARNING( "invalid color code, must be [a-zA-Z0-9] or empty" );
} else if ( var->type == CVART_COLOR_CHBLS ) { } else if ( var->type == CVART_COLOR_CHBLS ) {
if ( strlen(value) != 5 ) if ( strlen(value) != 5 )
WARNING( "must be 5 chars" ); WARNING( "must be 5 chars" );
@ -640,6 +643,7 @@ void Cvar_SetDataType( const char* cvarName, cvarType_t type )
Q_assert( Q_assert(
type == CVART_STRING || type == CVART_STRING ||
type == CVART_COLOR_CPMA || type == CVART_COLOR_CPMA ||
type == CVART_COLOR_CPMA_E ||
type == CVART_COLOR_CHBLS || type == CVART_COLOR_CHBLS ||
type == CVART_COLOR_RGB || type == CVART_COLOR_RGB ||
type == CVART_COLOR_RGBA ); type == CVART_COLOR_RGBA );
@ -826,10 +830,10 @@ void Cvar_PrintTypeAndRange( const char *var_name, printf_t print )
print( "RGB" ); print( "RGB" );
} else if ( var->type == CVART_COLOR_RGBA ) { } else if ( var->type == CVART_COLOR_RGBA ) {
print( "RGBA" ); print( "RGBA" );
} else if ( var->type == CVART_COLOR_CPMA ) { } else if ( var->type == CVART_COLOR_CPMA || var->type == CVART_COLOR_CPMA_E ) {
print( "color_code" ); print( "color code" );
} else if ( var->type == CVART_COLOR_CHBLS ) { } else if ( var->type == CVART_COLOR_CHBLS ) {
print( "color_CHBLS" ); print( "CHBLS colors" );
} else { } else {
print( "string" ); print( "string" );
} }

1
code/qcommon/q_shared.h
View file

@ -698,6 +698,7 @@ typedef enum {
CVART_BOOL, // uses integer min/max bounds, min=0 and max=1 CVART_BOOL, // uses integer min/max bounds, min=0 and max=1
// extended data types (not currently used by the CPMA QVMs) // extended data types (not currently used by the CPMA QVMs)
CVART_COLOR_CPMA, // CPMA color code (0-9 A-Z a-z) CVART_COLOR_CPMA, // CPMA color code (0-9 A-Z a-z)
CVART_COLOR_CPMA_E, // CPMA color code or empty
CVART_COLOR_CHBLS, // CPMA color codes: rail Core, Head, Body, Legs, rail Spiral CVART_COLOR_CHBLS, // CPMA color codes: rail Core, Head, Body, Legs, rail Spiral
CVART_COLOR_RGB, // as hex, e.g. FF00FF CVART_COLOR_RGB, // as hex, e.g. FF00FF
CVART_COLOR_RGBA, // as hex, e.g. FF00FF00 CVART_COLOR_RGBA, // as hex, e.g. FF00FF00