From a2f55e655a2b08f0631e6470cb6faa8c6f73dc3b Mon Sep 17 00:00:00 2001 From: Richard Allen Date: Sun, 22 Aug 2010 15:44:55 +0000 Subject: [PATCH] Fixing underlines I broke when merging in latest ioq3 --- reaction/code/qcommon/q_shared.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/reaction/code/qcommon/q_shared.h b/reaction/code/qcommon/q_shared.h index 20ca08ec..d2ca1735 100644 --- a/reaction/code/qcommon/q_shared.h +++ b/reaction/code/qcommon/q_shared.h @@ -374,7 +374,8 @@ extern vec4_t colorMdGrey; extern vec4_t colorDkGrey; #define Q_COLOR_ESCAPE '^' -#define Q_IsColorString(p) ((p) && *(p) == Q_COLOR_ESCAPE && *((p)+1) && isalnum(*((p)+1))) // ^[0-9a-zA-Z] +//#define Q_IsColorString(p) ((p) && *(p) == Q_COLOR_ESCAPE && *((p)+1) && isalnum(*((p)+1))) // ^[0-9a-zA-Z] +#define Q_IsColorString(p) ( p && *(p) == Q_COLOR_ESCAPE && *((p)+1) && *((p)+1) != Q_COLOR_ESCAPE ) #define COLOR_BLACK '0' #define COLOR_RED '1' @@ -384,7 +385,8 @@ extern vec4_t colorDkGrey; #define COLOR_CYAN '5' #define COLOR_MAGENTA '6' #define COLOR_WHITE '7' -#define ColorIndex(c) (((c) - '0') & 0x07) +//#define ColorIndex(c) (((c) - '0') & 0x07) +#define ColorIndex(c) ( ( (c) - '0' ) & 7 ) #define S_COLOR_BLACK "^0" #define S_COLOR_RED "^1"