diff options
| author | Tim Angus <tim@ngus.net> | 2009-10-26 00:10:07 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:17:05 +0000 |
| commit | 0fed3b1c32d99560482ea162b197531439df76e5 (patch) | |
| tree | dd5f74d3124715a538462aa474f9af294f79bbbd /src/client/cl_scrn.c | |
| parent | af6fd4fa5aaa4dc7c59ae54ead20d5ef0fbcc946 (diff) | |
* Merge ioq3-r1708
Diffstat (limited to 'src/client/cl_scrn.c')
| -rw-r--r-- | src/client/cl_scrn.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/client/cl_scrn.c b/src/client/cl_scrn.c index c44950f2..88bec95c 100644 --- a/src/client/cl_scrn.c +++ b/src/client/cl_scrn.c @@ -274,14 +274,16 @@ void SCR_DrawSmallStringExt( int x, int y, const char *string, float *setColor, xx = x; re.SetColor( setColor ); while ( *s ) { - if ( !noColorEscape && Q_IsColorString( s ) ) { + if ( Q_IsColorString( s ) ) { if ( !forceColor ) { Com_Memcpy( color, g_color_table[ColorIndex(*(s+1))], sizeof( color ) ); color[3] = setColor[3]; re.SetColor( color ); } - s += 2; - continue; + if ( !noColorEscape ) { + s += 2; + continue; + } } SCR_DrawSmallChar( xx, y, *s ); xx += SMALLCHAR_WIDTH; |