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

Add dpad button graphic, trick reminder on failed trick

Browse source
This commit is contained in:
AJ Martinez 2024-05-01 01:23:09 -07:00
parent e2db57d141
commit c53bd19db0
6 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_hud.cpp
View file

@ -237,6 +237,7 @@ patch_t *kp_button_up[2];
patch_t *kp_button_down[2]; patch_t *kp_button_down[2];
patch_t *kp_button_right[2]; patch_t *kp_button_right[2];
patch_t *kp_button_left[2]; patch_t *kp_button_left[2];
patch_t *kp_button_dpad[2];
static void K_LoadButtonGraphics(patch_t *kp[2], int letter) 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_down, 'K');
K_LoadButtonGraphics(kp_button_right, 'L'); K_LoadButtonGraphics(kp_button_right, 'L');
K_LoadButtonGraphics(kp_button_left, 'M'); K_LoadButtonGraphics(kp_button_left, 'M');
K_LoadButtonGraphics(kp_button_dpad, 'T');
} }
// For the item toggle menu // For the item toggle menu

1
src/k_hud.h
View file

@ -92,6 +92,7 @@ extern patch_t *kp_button_up[2];
extern patch_t *kp_button_down[2]; extern patch_t *kp_button_down[2];
extern patch_t *kp_button_right[2]; extern patch_t *kp_button_right[2];
extern patch_t *kp_button_left[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_eggnum[6];
extern patch_t *kp_facenum[MAXPLAYERS+1]; extern patch_t *kp_facenum[MAXPLAYERS+1];

1
src/k_kart.c
View file

@ -13393,6 +13393,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->tumbleHeight = 30; // Base tumble bounce height player->tumbleHeight = 30; // Base tumble bounce height
player->trickpanel = TRICKSTATE_NONE; player->trickpanel = TRICKSTATE_NONE;
P_SetPlayerMobjState(player->mo, S_KART_SPINOUT); P_SetPlayerMobjState(player->mo, S_KART_SPINOUT);
K_AddMessageForPlayer(player, "Press <dpad> + <a> to trick!", true, false);
if (player->itemflags & (IF_ITEMOUT|IF_EGGMANOUT)) if (player->itemflags & (IF_ITEMOUT|IF_EGGMANOUT))
{ {
//K_PopPlayerShield(player); // shield is just being yeeted, don't pop //K_PopPlayerShield(player); // shield is just being yeeted, don't pop

3
src/v_draw.cpp
View file

@ -43,6 +43,8 @@ Draw::TextElement& Draw::TextElement::parse(std::string_view raw)
BUTTON("right", 0x02), BUTTON("right", 0x02),
BUTTON("left", 0x03), BUTTON("left", 0x03),
BUTTON("dpad", 0x04),
BUTTON("r", 0x07), BUTTON("r", 0x07),
BUTTON("l", 0x08), BUTTON("l", 0x08),
BUTTON("start", 0x09), BUTTON("start", 0x09),
@ -197,6 +199,7 @@ patch_t** get_button_patch(Draw::Button type, int ver)
X(down); X(down);
X(right); X(right);
X(left); X(left);
X(dpad);
#undef X #undef X
} }

1
src/v_draw.hpp
View file

@ -76,6 +76,7 @@ public:
down, down,
right, right,
left, left,
dpad,
}; };
class TextElement class TextElement

7
src/v_video.cpp
View file

@ -2505,6 +2505,11 @@ static UINT8 V_GetButtonCodeWidth(UINT8 c)
x = 14; x = 14;
break; break;
case 0x04:
// dpad
x = 14;
break;
case 0x0A: case 0x0A:
case 0x0B: case 0x0B:
case 0x0C: case 0x0C:
@ -2700,6 +2705,8 @@ void V_DrawStringScaled(
case 0x02: return {{0, 3, Draw::Button::right}}; case 0x02: return {{0, 3, Draw::Button::right}};
case 0x03: return {{0, 3, Draw::Button::left}}; 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 0x07: return {{0, 2, Draw::Button::r}};
case 0x08: return {{0, 2, Draw::Button::l}}; case 0x08: return {{0, 2, Draw::Button::l}};