mirror of
https://github.com/Q3Rally-Team/q3rally.git
synced 2024-11-22 03:51:23 +00:00
Revert chat changes made in r437 and r438.
This commit is contained in:
parent
69051a0340
commit
d6679e53ab
2 changed files with 6 additions and 5 deletions
|
@ -574,7 +574,7 @@ void Con_DrawNotify (void)
|
|||
currentColor = 7;
|
||||
re.SetColor( g_color_table[currentColor] );
|
||||
|
||||
v = 336;
|
||||
v = 0;
|
||||
for (i= con.current-NUM_CON_TIMES+1 ; i<=con.current ; i++)
|
||||
{
|
||||
if (i < 0)
|
||||
|
@ -583,7 +583,7 @@ void Con_DrawNotify (void)
|
|||
if (time == 0)
|
||||
continue;
|
||||
time = cls.realtime - time;
|
||||
if (time > con_notifytime->value*2000)
|
||||
if (time > con_notifytime->value*1000)
|
||||
continue;
|
||||
text = con.text + (i % con.totallines)*con.linewidth;
|
||||
|
||||
|
@ -599,7 +599,7 @@ void Con_DrawNotify (void)
|
|||
currentColor = ColorIndexForNumber( text[x]>>8 );
|
||||
re.SetColor( g_color_table[currentColor] );
|
||||
}
|
||||
SCR_DrawSmallChar( cl_conXOffset->integer + con.xadjust + (x+1)*SMALLCHAR_WIDTH, v+300, text[x] & 0xff );
|
||||
SCR_DrawSmallChar( cl_conXOffset->integer + con.xadjust + (x+1)*SMALLCHAR_WIDTH, v, text[x] & 0xff );
|
||||
}
|
||||
|
||||
v += SMALLCHAR_HEIGHT;
|
||||
|
@ -616,12 +616,12 @@ void Con_DrawNotify (void)
|
|||
{
|
||||
if (chat_team)
|
||||
{
|
||||
SCR_DrawBigString (8, v, "Team Chat: ", 1.0f, qfalse );
|
||||
SCR_DrawBigString (8, v, "say_team:", 1.0f, qfalse );
|
||||
skip = 10;
|
||||
}
|
||||
else
|
||||
{
|
||||
SCR_DrawBigString (8, v, "Chat: ", 1.0f, qfalse );
|
||||
SCR_DrawBigString (8, v, "say:", 1.0f, qfalse );
|
||||
skip = 5;
|
||||
}
|
||||
|
||||
|
|
|
@ -581,6 +581,7 @@ void SCR_DrawBigStringColor( int x, int y, const char *s, vec4_t color, qboolean
|
|||
void SCR_DrawSmallStringExt( int x, int y, const char *string, float *setColor, qboolean forceColor, qboolean noColorEscape );
|
||||
void SCR_DrawSmallChar( int x, int y, int ch );
|
||||
|
||||
|
||||
//
|
||||
// cl_cin.c
|
||||
//
|
||||
|
|
Loading…
Reference in a new issue