q3rally-team/q3rally
0
0
Fork 0
mirror of https://github.com/Q3Rally-Team/q3rally.git synced 2024-11-25 13:21:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert chat changes made in r437 and r438.

Browse source
This commit is contained in:
zturtleman 2021-12-22 02:23:39 +00:00
parent 69051a0340
commit d6679e53ab
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
engine/code/client/cl_console.c
View file

@ -574,7 +574,7 @@ void Con_DrawNotify (void)
currentColor = 7; currentColor = 7;
re.SetColor( g_color_table[currentColor] ); re.SetColor( g_color_table[currentColor] );
v = 336; v = 0;
for (i= con.current-NUM_CON_TIMES+1 ; i<=con.current ; i++) for (i= con.current-NUM_CON_TIMES+1 ; i<=con.current ; i++)
{ {
if (i < 0) if (i < 0)
@ -583,7 +583,7 @@ void Con_DrawNotify (void)
if (time == 0) if (time == 0)
continue; continue;
time = cls.realtime - time; time = cls.realtime - time;
if (time > con_notifytime->value*2000) if (time > con_notifytime->value*1000)
continue; continue;
text = con.text + (i % con.totallines)*con.linewidth; text = con.text + (i % con.totallines)*con.linewidth;
@ -599,7 +599,7 @@ void Con_DrawNotify (void)
currentColor = ColorIndexForNumber( text[x]>>8 ); currentColor = ColorIndexForNumber( text[x]>>8 );
re.SetColor( g_color_table[currentColor] ); 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; v += SMALLCHAR_HEIGHT;
@ -616,12 +616,12 @@ void Con_DrawNotify (void)
{ {
if (chat_team) if (chat_team)
{ {
SCR_DrawBigString (8, v, "Team Chat: ", 1.0f, qfalse ); SCR_DrawBigString (8, v, "say_team:", 1.0f, qfalse );
skip = 10; skip = 10;
} }
else else
{ {
SCR_DrawBigString (8, v, "Chat: ", 1.0f, qfalse ); SCR_DrawBigString (8, v, "say:", 1.0f, qfalse );
skip = 5; skip = 5;
} }

1
engine/code/client/client.h
View file

@ -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_DrawSmallStringExt( int x, int y, const char *string, float *setColor, qboolean forceColor, qboolean noColorEscape );
void SCR_DrawSmallChar( int x, int y, int ch ); void SCR_DrawSmallChar( int x, int y, int ch );
// //
// cl_cin.c // cl_cin.c
// //