From 3ad8d1c4cef780b900f0bbc31b41d02c484f2c71 Mon Sep 17 00:00:00 2001 From: TehRealSalt Date: Thu, 8 Nov 2018 19:36:05 -0500 Subject: [PATCH] Lap emblem gets replaced with a stopwatch in Record Attack --- src/k_kart.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/k_kart.c b/src/k_kart.c index 45a534ad..c91242d1 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -5640,7 +5640,7 @@ static patch_t *kp_challenger[25]; static patch_t *kp_lapanim_lap[7]; static patch_t *kp_lapanim_final[11]; static patch_t *kp_lapanim_number[10][3]; -static patch_t *kp_lapanim_emblem; +static patch_t *kp_lapanim_emblem[2]; static patch_t *kp_lapanim_hand[3]; static patch_t *kp_yougotem; @@ -5867,7 +5867,12 @@ void K_LoadKartHUDGraphics(void) } } - kp_lapanim_emblem = (patch_t *) W_CachePatchName("K_LAPE00", PU_HUDGFX); + sprintf(buffer, "K_LAPE0x"); + for (i = 0; i < 2; i++) + { + buffer[7] = '0'+(i+1); + kp_lapanim_emblem[i] = (patch_t *) W_CachePatchName(buffer, PU_HUDGFX); + } sprintf(buffer, "K_LAPH0x"); for (i = 0; i < 3; i++) @@ -7561,7 +7566,7 @@ static void K_drawLapStartAnim(void) V_DrawFixedPatch((BASEVIDWIDTH/2 + (32*max(0, stplyr->kartstuff[k_lapanimation]-76)))*FRACUNIT, (48 - (32*max(0, progress-76)))*FRACUNIT, FRACUNIT, V_HUDTRANS, - kp_lapanim_emblem, colormap); + (modeattacking ? kp_lapanim_emblem[1] : kp_lapanim_emblem[0]), colormap); if (stplyr->kartstuff[k_laphand] >= 1 && stplyr->kartstuff[k_laphand] <= 3) { @@ -7575,14 +7580,14 @@ static void K_drawLapStartAnim(void) if (stplyr->laps == (UINT8)(cv_numlaps.value - 1)) { V_DrawFixedPatch((62 - (32*max(0, progress-76)))*FRACUNIT, // 27 - (-6)*FRACUNIT, // 24 + 30*FRACUNIT, // 24 FRACUNIT, V_HUDTRANS, kp_lapanim_final[min(progress/2, 10)], NULL); if (progress/2-12 >= 0) { V_DrawFixedPatch((188 + (32*max(0, progress-76)))*FRACUNIT, // 194 - (-6)*FRACUNIT, // 24 + 30*FRACUNIT, // 24 FRACUNIT, V_HUDTRANS, kp_lapanim_lap[min(progress/2-12, 6)], NULL); } @@ -7590,21 +7595,21 @@ static void K_drawLapStartAnim(void) else { V_DrawFixedPatch((82 - (32*max(0, progress-76)))*FRACUNIT, // 61 - (-6)*FRACUNIT, // 24 + 30*FRACUNIT, // 24 FRACUNIT, V_HUDTRANS, kp_lapanim_lap[min(progress/2, 6)], NULL); if (progress/2-8 >= 0) { V_DrawFixedPatch((188 + (32*max(0, progress-76)))*FRACUNIT, // 194 - (-6)*FRACUNIT, // 24 + 30*FRACUNIT, // 24 FRACUNIT, V_HUDTRANS, kp_lapanim_number[(((UINT32)stplyr->laps+1) / 10)][min(progress/2-8, 2)], NULL); if (progress/2-10 >= 0) { V_DrawFixedPatch((208 + (32*max(0, progress-76)))*FRACUNIT, // 221 - (-6)*FRACUNIT, // 24 + 30*FRACUNIT, // 24 FRACUNIT, V_HUDTRANS, kp_lapanim_number[(((UINT32)stplyr->laps+1) % 10)][min(progress/2-10, 2)], NULL); }