The text spacing vortex consumes all

This commit is contained in:
Antonio Martinez 2024-09-16 04:02:39 -07:00 committed by AJ Martinez
parent 7019c77b96
commit af4dc813e2
4 changed files with 10 additions and 5 deletions

View file

@ -6504,7 +6504,7 @@ void K_drawKartHUD(void)
if (1) if (1)
{ {
Draw::TextElement text = Draw::TextElement().parse("A \xEF\xA0 A\nB \xEF\xA1 B\nX \xEF\xA2 X\nY \xEF\xA3 Y\nLB \xEF\xA4 LB\nRB \xEF\xA5 RB\nLT \xEF\xA6 LT\nRT \xEF\xA7 RT\nST \xEF\xA8 ST\nBK \xEF\xA9 BK\nLS \xEF\xAA LS\nRS \xEF\xAB RS\n"); Draw::TextElement text = Draw::TextElement().parse("\xEELEFTSPACE\xEE\n\xEESPC\xEE \xEETAB\xEE\nA \xEF\xA0 A\nB \xEF\xA1 B\nX \xEF\xA2 X\nY \xEF\xA3 Y\nLB \xEF\xA4 LB\nRB \xEF\xA5 RB\nLT \xEF\xA6 LT\nRT \xEF\xA7 RT\nST \xEF\xA8 ST\nBK \xEF\xA9 BK\nLS \xEF\xAA LS\nRS \xEF\xAB RS\n");
player_t *oldstplyr = stplyr; player_t *oldstplyr = stplyr;
stplyr = &players[0]; stplyr = &players[0];

View file

@ -834,7 +834,7 @@ void M_DrawMenuMessage(void)
{ {
workx -= K_DrawGameControl( workx -= K_DrawGameControl(
workx+2, worky, workx+2, worky,
0, "<b_animated><x_animated>", 2 0, "<b_animated> <x_animated> ", 2
); );
} }
else else
@ -864,7 +864,7 @@ void M_DrawMenuMessage(void)
{ {
workx -= K_DrawGameControl( workx -= K_DrawGameControl(
workx+2, worky, workx+2, worky,
0, "<a_animated>", 2 0, "<a_animated> ", 2
); );
} }
else else

View file

@ -2705,7 +2705,6 @@ void V_DrawStringScaled(
descriptive = true; descriptive = true;
break; break;
case '\xEE': case '\xEE':
cx += FRACUNIT*dupx;
boxed = !boxed; boxed = !boxed;
if (boxed) // draw caps if (boxed) // draw caps
{ {
@ -2714,6 +2713,7 @@ void V_DrawStringScaled(
} }
else else
{ {
cx += 3*scale;
//V_DrawFill((cx)/FRACUNIT+(fontspec.right_outline), (cy)/FRACUNIT-2, 2, fontspec.lfh/FRACUNIT, flags|outerbox); //V_DrawFill((cx)/FRACUNIT+(fontspec.right_outline), (cy)/FRACUNIT-2, 2, fontspec.lfh/FRACUNIT, flags|outerbox);
//V_DrawFill((cx)/FRACUNIT+(fontspec.right_outline), (cy)/FRACUNIT-1, 1, fontspec.lfh/FRACUNIT-2, flags|innerbox); //V_DrawFill((cx)/FRACUNIT+(fontspec.right_outline), (cy)/FRACUNIT-1, 1, fontspec.lfh/FRACUNIT-2, flags|innerbox);
} }
@ -2982,6 +2982,7 @@ fixed_t V_StringScaledWidth(
font_t *font; font_t *font;
boolean uppercase; boolean uppercase;
boolean boxed = false;
boolean descriptive = false;; boolean descriptive = false;;
fixed_t cx; fixed_t cx;
@ -3045,7 +3046,9 @@ fixed_t V_StringScaledWidth(
descriptive = true; descriptive = true;
break; break;
case '\xEE': case '\xEE':
cx += FRACUNIT*dupx; if (boxed)
cx += 3*scale;
boxed = !boxed;
break; break;
default: default:
if (( c & 0xF0 ) == 0x80 || c == V_STRINGDANCE) if (( c & 0xF0 ) == 0x80 || c == V_STRINGDANCE)

View file

@ -2406,6 +2406,8 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error)
{"K_", 2}, // Kart graphic changes {"K_", 2}, // Kart graphic changes
{"MUSICDEF", 8}, // Kart song definitions {"MUSICDEF", 8}, // Kart song definitions
{"TLG_", 4}, // Generic button legends
#ifdef HWRENDER #ifdef HWRENDER
{"SHADERS", 7}, {"SHADERS", 7},
{"SH_", 3}, {"SH_", 3},