Revert back color code change

This commit is contained in:
Thilo Schulz 2009-10-03 21:41:22 +00:00
parent b433f3d01c
commit b2c1618f36
2 changed files with 3 additions and 3 deletions

View file

@ -632,7 +632,7 @@ static void ClientCleanName(const char *in, char *out, int outSize)
{
colorlessLen--;
if(*in == COLOR_BLACK)
if(ColorIndex(*in) == 0)
{
// Disallow color black in names to prevent players
// from getting advantage playing in front of black backgrounds

View file

@ -365,7 +365,7 @@ extern vec4_t colorMdGrey;
extern vec4_t colorDkGrey;
#define Q_COLOR_ESCAPE '^'
#define Q_IsColorString(p) ((p) && *(p) == Q_COLOR_ESCAPE && *((p)+1) && *((p)+1) >= '0' && *((p)+1) <= '7') // ^[0-9a-zA-Z]
#define Q_IsColorString(p) ((p) && *(p) == Q_COLOR_ESCAPE && *((p)+1) && isalnum(*((p)+1))) // ^[0-9a-zA-Z]
#define COLOR_BLACK '0'
#define COLOR_RED '1'
@ -375,7 +375,7 @@ extern vec4_t colorDkGrey;
#define COLOR_CYAN '5'
#define COLOR_MAGENTA '6'
#define COLOR_WHITE '7'
#define ColorIndex(c) ((c) - '0')
#define ColorIndex(c) (((c) - '0') & 0x07)
#define S_COLOR_BLACK "^0"
#define S_COLOR_RED "^1"