thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-26 12:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the accidential reduction in wordwrap width for New Chat messages

Browse source
This commit is contained in:
toaster 2023-07-11 23:41:13 +01:00
parent 40dfe494cc
commit c7f57614de
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/hu_stuff.c
View file

@ -1271,10 +1271,10 @@ boolean HU_Responder(event_t *ev)
// Precompile a wordwrapped string to any given width. // Precompile a wordwrapped string to any given width.
// Now a wrapper for the chat drawer. // Now a wrapper for the chat drawer.
static char *CHAT_WordWrap(INT32 x, INT32 w, fixed_t scale, INT32 option, const char *string) static char *CHAT_WordWrap(INT32 w, fixed_t scale, INT32 option, const char *string)
{ {
return V_ScaledWordWrap( return V_ScaledWordWrap(
(w - x) << FRACBITS, w << FRACBITS,
scale, FRACUNIT, FRACUNIT, scale, FRACUNIT, FRACUNIT,
option, option,
HU_FONT, HU_FONT,
@ -1312,7 +1312,7 @@ static void HU_drawMiniChat(void)
for (; i > 0; i--) for (; i > 0; i--)
{ {
char *msg = CHAT_WordWrap(x, boxw-4, scale, V_SNAPTOBOTTOM|V_SNAPTOLEFT, chat_mini[i-1]); char *msg = CHAT_WordWrap(boxw-4, scale, V_SNAPTOBOTTOM|V_SNAPTOLEFT, chat_mini[i-1]);
size_t j = 0; size_t j = 0;
INT32 linescount = 1; INT32 linescount = 1;
@ -1352,7 +1352,7 @@ static void HU_drawMiniChat(void)
INT32 timer = ((cv_chattime.value*TICRATE)-chat_timers[i]) - cv_chattime.value*TICRATE+9; // see below... INT32 timer = ((cv_chattime.value*TICRATE)-chat_timers[i]) - cv_chattime.value*TICRATE+9; // see below...
INT32 transflag = (timer >= 0 && timer <= 9) ? (timer*V_10TRANS) : 0; // you can make bad jokes out of this one. INT32 transflag = (timer >= 0 && timer <= 9) ? (timer*V_10TRANS) : 0; // you can make bad jokes out of this one.
size_t j = 0; size_t j = 0;
char *msg = CHAT_WordWrap(x, boxw-4, scale, V_SNAPTOBOTTOM|V_SNAPTOLEFT, chat_mini[i]); // get the current message, and word wrap it. char *msg = CHAT_WordWrap(boxw-4, scale, V_SNAPTOBOTTOM|V_SNAPTOLEFT, chat_mini[i]); // get the current message, and word wrap it.
INT32 linescount = 1; INT32 linescount = 1;
@ -1460,7 +1460,7 @@ static void HU_drawChatLog(INT32 offset)
for (i=0; i<chat_nummsg_log; i++) // iterate through our chatlog for (i=0; i<chat_nummsg_log; i++) // iterate through our chatlog
{ {
INT32 j = 0, startj = 0; INT32 j = 0, startj = 0;
char *msg = CHAT_WordWrap(x, boxw-4, scale, V_SNAPTOBOTTOM|V_SNAPTOLEFT, chat_log[i]); // get the current message, and word wrap it. char *msg = CHAT_WordWrap(boxw-4, scale, V_SNAPTOBOTTOM|V_SNAPTOLEFT, chat_log[i]); // get the current message, and word wrap it.
INT32 linescount = 1; INT32 linescount = 1;
@ -1590,7 +1590,7 @@ static void HU_DrawChat(void)
else else
{ {
msg = CHAT_WordWrap( msg = CHAT_WordWrap(
chatx + 2, boxw-4, boxw-4,
scale, scale,
V_SNAPTOBOTTOM|V_SNAPTOLEFT, V_SNAPTOBOTTOM|V_SNAPTOLEFT,
va("%c%s %c%s%c%c", cflag, talk, tflag, w_chat, '\x80', '_') va("%c%s %c%s%c%c", cflag, talk, tflag, w_chat, '\x80', '_')