From d6679e53ab8c246daff3c493c3d2901904ce7a60 Mon Sep 17 00:00:00 2001 From: zturtleman Date: Wed, 22 Dec 2021 02:23:39 +0000 Subject: [PATCH] Revert chat changes made in r437 and r438. --- engine/code/client/cl_console.c | 10 +++++----- engine/code/client/client.h | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/engine/code/client/cl_console.c b/engine/code/client/cl_console.c index 67bcaa28..964fe7d6 100644 --- a/engine/code/client/cl_console.c +++ b/engine/code/client/cl_console.c @@ -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; } diff --git a/engine/code/client/client.h b/engine/code/client/client.h index 18a416c5..9bc03068 100644 --- a/engine/code/client/client.h +++ b/engine/code/client/client.h @@ -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 //