From bf41f3ec2931cbe7153465de0462abbca986c6f1 Mon Sep 17 00:00:00 2001 From: James R Date: Sat, 2 Mar 2024 00:22:44 -0800 Subject: [PATCH] Input Display: slide with dialogue box --- src/hud/input-display.cpp | 2 +- src/k_hud.cpp | 5 +++-- src/k_hud.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/hud/input-display.cpp b/src/hud/input-display.cpp index 864b5dbf8..8d82799ac 100644 --- a/src/hud/input-display.cpp +++ b/src/hud/input-display.cpp @@ -62,7 +62,7 @@ const char* dpad_suffix(const Vec2& v) }; // namespace -void K_DrawInputDisplay(INT32 x, INT32 y, INT32 flags, char mode, UINT8 pid, boolean local, boolean transparent) +void K_DrawInputDisplay(float x, float y, INT32 flags, char mode, UINT8 pid, boolean local, boolean transparent) { auto fade_in = [] { diff --git a/src/k_hud.cpp b/src/k_hud.cpp index 848edbc36..5009f8009 100644 --- a/src/k_hud.cpp +++ b/src/k_hud.cpp @@ -51,6 +51,7 @@ #include "g_party.h" #include "k_hitlag.h" #include "g_input.h" +#include "k_dialogue.h" //{ Patch Definitions static patch_t *kp_nodraw; @@ -5174,8 +5175,8 @@ static void K_drawInput(void) char mode = ((stplyr->pflags & PF_ANALOGSTICK) ? '4' : '2') + (r_splitscreen > 1); bool local = !demo.playback && P_IsMachineLocalPlayer(stplyr); K_DrawInputDisplay( - def[k][0], - def[k][1], + def[k][0] - FixedToFloat(K_GetDialogueSlide(34 * FRACUNIT)), + def[k][1] - FixedToFloat(K_GetDialogueSlide(51 * FRACUNIT)), flags, mode, (local ? G_LocalSplitscreenPartyPosition : G_PartyPosition)(stplyr - players), diff --git a/src/k_hud.h b/src/k_hud.h index 422f3559f..94ee18343 100644 --- a/src/k_hud.h +++ b/src/k_hud.h @@ -63,7 +63,7 @@ void K_DrawKartPositionNumXY( boolean exit, boolean lastLap, boolean losing ); -void K_DrawInputDisplay(INT32 x, INT32 y, INT32 flags, char mode, UINT8 pid, boolean local, boolean transparent); +void K_DrawInputDisplay(float x, float y, INT32 flags, char mode, UINT8 pid, boolean local, boolean transparent); extern patch_t *kp_capsuletarget_arrow[2][2]; extern patch_t *kp_capsuletarget_icon[2];