sydney/q3-sydney-qvm
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into sdl2

Browse Source 
Conflicts:
	.travis.yml
This commit is contained in:
Zack Middleton committed 2014-06-03 00:52:49 -05:00
2 parents cd3b7133ae af79d2cb38
commit 107cae63d6
21 files changed
+162 -240
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/sys/con_win32.c
+1 -1
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 ];