1
0
Fork 0
forked from fte/fteqw

fixes to sys_colorconsole

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2166 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2006-04-06 08:33:47 +00:00
parent f482d8a514
commit 884dacd654
3 changed files with 4 additions and 4 deletions

View file

@ -85,7 +85,7 @@ extern conchar_t q3codemasks[MAXQ3COLOURS];
#define CON_TEXTSIZE 16384 #define CON_TEXTSIZE 16384
#define isextendedcode(x) ((x >= '0' && x <= '9') || (x >= 'A' && x <= 'F') || x == '-') #define isextendedcode(x) (((x) >= '0' && (x) <= '9') || ((x) >= 'A' && (x) <= 'F') || (x) == '-')
typedef struct console_s typedef struct console_s
{ {

View file

@ -265,12 +265,14 @@ void Sys_PrintColouredChar(unsigned int chr)
{ {
ApplyColour(chr); ApplyColour(chr);
chr = chr & CON_CHARMASK;
if ((chr > 128 || chr < 32) && chr != 10 && chr != 13 && chr != 9) if ((chr > 128 || chr < 32) && chr != 10 && chr != 13 && chr != 9)
printf("[%02x]", chr); printf("[%02x]", chr);
else else
chr &= ~0x80; chr &= ~0x80;
putch(chr & CON_CHARMASK); putch(chr);
} }
/* /*
@ -372,7 +374,6 @@ void Sys_Printf (char *fmt, ...)
continue; continue;
} }
Sys_PrintColouredChar('^' | ext); Sys_PrintColouredChar('^' | ext);
Sys_PrintColouredChar('&' | ext);
// else invalid code // else invalid code
} }
else if (*str == 'a') else if (*str == 'a')

View file

@ -582,7 +582,6 @@ void Sys_Printf (char *fmt, ...)
continue; continue;
} }
Sys_PrintColouredChar('^' | ext); Sys_PrintColouredChar('^' | ext);
Sys_PrintColouredChar('&' | ext);
// else invalid code // else invalid code
} }
else if (*str == 'a') else if (*str == 'a')