From af4dc813e2189db58d71c5cfac78bda7448ec2d4 Mon Sep 17 00:00:00 2001
From: Antonio Martinez <aj@worldsbe.st>
Date: Mon, 16 Sep 2024 04:02:39 -0700
Subject: [PATCH] The text spacing vortex consumes all

---
 src/k_hud.cpp    | 2 +-
 src/k_menudraw.c | 4 ++--
 src/v_video.cpp  | 7 +++++--
 src/w_wad.cpp    | 2 ++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/k_hud.cpp b/src/k_hud.cpp
index bf5c52e57..fd6ea180a 100644
--- a/src/k_hud.cpp
+++ b/src/k_hud.cpp
@@ -6504,7 +6504,7 @@ void K_drawKartHUD(void)
 
 	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;
 	stplyr = &players[0];
diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index 72b4483c4..e54170242 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -834,7 +834,7 @@ void M_DrawMenuMessage(void)
 		{
 			workx -= K_DrawGameControl(
 				workx+2, worky,
-				0, "<b_animated><x_animated>", 2
+				0, "<b_animated> <x_animated> ", 2
 			);
 		}
 		else
@@ -864,7 +864,7 @@ void M_DrawMenuMessage(void)
 		{
 			workx -= K_DrawGameControl(
 				workx+2, worky,
-				0, "<a_animated>", 2
+				0, "<a_animated> ", 2
 			);
 		}
 		else
diff --git a/src/v_video.cpp b/src/v_video.cpp
index 49f0e5233..0f278cf79 100644
--- a/src/v_video.cpp
+++ b/src/v_video.cpp
@@ -2705,7 +2705,6 @@ void V_DrawStringScaled(
 				descriptive = true;
 				break;
 			case '\xEE':
-				cx += FRACUNIT*dupx;
 				boxed = !boxed;
 				if (boxed) // draw caps
 				{
@@ -2714,6 +2713,7 @@ void V_DrawStringScaled(
 				}
 				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-1, 1, fontspec.lfh/FRACUNIT-2, flags|innerbox);
 				}
@@ -2982,6 +2982,7 @@ fixed_t V_StringScaledWidth(
 	font_t   *font;
 
 	boolean uppercase;
+	boolean boxed = false;
 	boolean descriptive = false;;
 
 	fixed_t cx;
@@ -3045,7 +3046,9 @@ fixed_t V_StringScaledWidth(
 				descriptive = true;
 				break;
 			case '\xEE':
-				cx += FRACUNIT*dupx;
+				if (boxed)
+					cx += 3*scale;
+				boxed = !boxed;
 				break;
 			default:
 				if (( c & 0xF0 ) == 0x80 || c == V_STRINGDANCE)
diff --git a/src/w_wad.cpp b/src/w_wad.cpp
index 8d31c97a1..1c4dbde49 100644
--- a/src/w_wad.cpp
+++ b/src/w_wad.cpp
@@ -2406,6 +2406,8 @@ int W_VerifyNMUSlumps(const char *filename, boolean exit_on_error)
 		{"K_", 2}, // Kart graphic changes
 		{"MUSICDEF", 8}, // Kart song definitions
 
+		{"TLG_", 4}, // Generic button legends
+
 #ifdef HWRENDER
 		{"SHADERS", 7},
 		{"SH_", 3},