Input Display: slide with dialogue box

This commit is contained in:
James R 2024-03-02 00:22:44 -08:00
parent bf65fb0cbf
commit bf41f3ec29
3 changed files with 5 additions and 4 deletions

View file

@ -62,7 +62,7 @@ const char* dpad_suffix(const Vec2<float>& v)
}; // namespace }; // 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 = [] auto fade_in = []
{ {

View file

@ -51,6 +51,7 @@
#include "g_party.h" #include "g_party.h"
#include "k_hitlag.h" #include "k_hitlag.h"
#include "g_input.h" #include "g_input.h"
#include "k_dialogue.h"
//{ Patch Definitions //{ Patch Definitions
static patch_t *kp_nodraw; 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); char mode = ((stplyr->pflags & PF_ANALOGSTICK) ? '4' : '2') + (r_splitscreen > 1);
bool local = !demo.playback && P_IsMachineLocalPlayer(stplyr); bool local = !demo.playback && P_IsMachineLocalPlayer(stplyr);
K_DrawInputDisplay( K_DrawInputDisplay(
def[k][0], def[k][0] - FixedToFloat(K_GetDialogueSlide(34 * FRACUNIT)),
def[k][1], def[k][1] - FixedToFloat(K_GetDialogueSlide(51 * FRACUNIT)),
flags, flags,
mode, mode,
(local ? G_LocalSplitscreenPartyPosition : G_PartyPosition)(stplyr - players), (local ? G_LocalSplitscreenPartyPosition : G_PartyPosition)(stplyr - players),

View file

@ -63,7 +63,7 @@ void K_DrawKartPositionNumXY(
boolean exit, boolean lastLap, boolean losing 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_arrow[2][2];
extern patch_t *kp_capsuletarget_icon[2]; extern patch_t *kp_capsuletarget_icon[2];