From 6eb2ff79c06c6d5acab3070937a680ff3494ba50 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sat, 22 Sep 2007 20:55:11 +0000 Subject: * Merge of ioq3-r1186 --- src/qcommon/q_shared.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/qcommon') diff --git a/src/qcommon/q_shared.h b/src/qcommon/q_shared.h index 74957af4..8c61aa7d 100644 --- a/src/qcommon/q_shared.h +++ b/src/qcommon/q_shared.h @@ -90,11 +90,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA **********************************************************************/ -#ifdef Q3_VM - #include "../game/bg_lib.h" -#else +#ifndef Q3_VM #include #include @@ -337,7 +335,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) != Q_COLOR_ESCAPE ) +#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' -- cgit