okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into sdl2

Browse source 
Conflicts:
	.travis.yml
This commit is contained in:
Zack Middleton 2014-06-03 00:52:49 -05:00
commit 107cae63d6
21 changed files with 162 additions and 240 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/sys/con_win32.c
View file

@ -208,7 +208,7 @@ static void CON_Show( void )
{
if( i < qconsole_linelen )
{
if( Q_IsColorString( qconsole_line + i ) )
if( i + 1 < qconsole_linelen && Q_IsColorString( qconsole_line + i ) )
attrib = CON_ColorCharToAttrib( *( qconsole_line + i + 1 ) );
line[ i ].Char.AsciiChar = qconsole_line[ i ];