From c53bd19db051346c118ee3febcf258274b34dcc0 Mon Sep 17 00:00:00 2001
From: AJ Martinez <aj@worldsbe.st>
Date: Wed, 1 May 2024 01:23:09 -0700
Subject: [PATCH] Add dpad button graphic, trick reminder on failed trick

---
 src/k_hud.cpp   | 2 ++
 src/k_hud.h     | 1 +
 src/k_kart.c    | 1 +
 src/v_draw.cpp  | 3 +++
 src/v_draw.hpp  | 1 +
 src/v_video.cpp | 7 +++++++
 6 files changed, 15 insertions(+)

diff --git a/src/k_hud.cpp b/src/k_hud.cpp
index 75f4ecf27..34f3d75a2 100644
--- a/src/k_hud.cpp
+++ b/src/k_hud.cpp
@@ -237,6 +237,7 @@ patch_t *kp_button_up[2];
 patch_t *kp_button_down[2];
 patch_t *kp_button_right[2];
 patch_t *kp_button_left[2];
+patch_t *kp_button_dpad[2];
 
 static void K_LoadButtonGraphics(patch_t *kp[2], int letter)
 {
@@ -910,6 +911,7 @@ void K_LoadKartHUDGraphics(void)
 	K_LoadButtonGraphics(kp_button_down, 'K');
 	K_LoadButtonGraphics(kp_button_right, 'L');
 	K_LoadButtonGraphics(kp_button_left, 'M');
+	K_LoadButtonGraphics(kp_button_dpad, 'T');
 }
 
 // For the item toggle menu
diff --git a/src/k_hud.h b/src/k_hud.h
index dea1e5a98..a4e92c728 100644
--- a/src/k_hud.h
+++ b/src/k_hud.h
@@ -92,6 +92,7 @@ extern patch_t *kp_button_up[2];
 extern patch_t *kp_button_down[2];
 extern patch_t *kp_button_right[2];
 extern patch_t *kp_button_left[2];
+extern patch_t *kp_button_dpad[2];
 
 extern patch_t *kp_eggnum[6];
 extern patch_t *kp_facenum[MAXPLAYERS+1];
diff --git a/src/k_kart.c b/src/k_kart.c
index bab173468..1857f09ad 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -13393,6 +13393,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
 				player->tumbleHeight = 30;	// Base tumble bounce height
 				player->trickpanel = TRICKSTATE_NONE;
 				P_SetPlayerMobjState(player->mo, S_KART_SPINOUT);
+				K_AddMessageForPlayer(player, "Press <dpad> + <a> to trick!", true, false);
 				if (player->itemflags & (IF_ITEMOUT|IF_EGGMANOUT))
 				{
 					//K_PopPlayerShield(player); // shield is just being yeeted, don't pop
diff --git a/src/v_draw.cpp b/src/v_draw.cpp
index 7914d0a0c..12a05d63c 100644
--- a/src/v_draw.cpp
+++ b/src/v_draw.cpp
@@ -43,6 +43,8 @@ Draw::TextElement& Draw::TextElement::parse(std::string_view raw)
 		BUTTON("right", 0x02),
 		BUTTON("left", 0x03),
 
+		BUTTON("dpad", 0x04),
+
 		BUTTON("r", 0x07),
 		BUTTON("l", 0x08),
 		BUTTON("start", 0x09),
@@ -197,6 +199,7 @@ patch_t** get_button_patch(Draw::Button type, int ver)
 	X(down);
 	X(right);
 	X(left);
+	X(dpad);
 
 #undef X
 	}
diff --git a/src/v_draw.hpp b/src/v_draw.hpp
index 8d5c8386a..82c60e845 100644
--- a/src/v_draw.hpp
+++ b/src/v_draw.hpp
@@ -76,6 +76,7 @@ public:
 		down,
 		right,
 		left,
+		dpad,
 	};
 
 	class TextElement
diff --git a/src/v_video.cpp b/src/v_video.cpp
index dfab8889e..984813060 100644
--- a/src/v_video.cpp
+++ b/src/v_video.cpp
@@ -2505,6 +2505,11 @@ static UINT8 V_GetButtonCodeWidth(UINT8 c)
 		x = 14;
 		break;
 
+	case 0x04:
+		// dpad
+		x = 14;
+		break;
+
 	case 0x0A:
 	case 0x0B:
 	case 0x0C:
@@ -2700,6 +2705,8 @@ void V_DrawStringScaled(
 							case 0x02: return {{0, 3, Draw::Button::right}};
 							case 0x03: return {{0, 3, Draw::Button::left}};
 
+							case 0x04: return {{0, 4, Draw::Button::dpad}};
+
 							case 0x07: return {{0, 2, Draw::Button::r}};
 							case 0x08: return {{0, 2, Draw::Button::l}};