diff options
| author | thilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-10-03 21:41:22 +0000 |
|---|---|---|
| committer | thilo <thilo@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2009-10-03 21:41:22 +0000 |
| commit | 3938a26866a4311e5d100d83cd3897925075908b (patch) | |
| tree | edf6f945ab4c31f0c09cc6844bd1477b2c43bfaf | |
| parent | e62ceb3c2672a11f6ea41adb93c1cf9e54ab1ef3 (diff) | |
| download | ioquake3-aero-3938a26866a4311e5d100d83cd3897925075908b.tar.gz ioquake3-aero-3938a26866a4311e5d100d83cd3897925075908b.zip | |
Revert back color code change
git-svn-id: svn://svn.icculus.org/quake3/trunk@1639 edf5b092-35ff-0310-97b2-ce42778d08ea
| -rw-r--r-- | code/game/g_client.c | 2 | ||||
| -rw-r--r-- | code/qcommon/q_shared.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/code/game/g_client.c b/code/game/g_client.c index 0d812ed..2e968af 100644 --- a/code/game/g_client.c +++ b/code/game/g_client.c @@ -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 diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h index 736d9e9..0680733 100644 --- a/code/qcommon/q_shared.h +++ b/code/qcommon/q_shared.h @@ -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" |