stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-27 21:01:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lap emblem gets replaced with a stopwatch in Record Attack

Browse source
This commit is contained in:
TehRealSalt 2018-11-08 19:36:05 -05:00
parent 68d2d00a07
commit 3ad8d1c4ce
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/k_kart.c
View file

@ -5640,7 +5640,7 @@ static patch_t *kp_challenger[25];
static patch_t *kp_lapanim_lap[7]; static patch_t *kp_lapanim_lap[7];
static patch_t *kp_lapanim_final[11]; static patch_t *kp_lapanim_final[11];
static patch_t *kp_lapanim_number[10][3]; 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_lapanim_hand[3];
static patch_t *kp_yougotem; 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"); sprintf(buffer, "K_LAPH0x");
for (i = 0; i < 3; i++) 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, V_DrawFixedPatch((BASEVIDWIDTH/2 + (32*max(0, stplyr->kartstuff[k_lapanimation]-76)))*FRACUNIT,
(48 - (32*max(0, progress-76)))*FRACUNIT, (48 - (32*max(0, progress-76)))*FRACUNIT,
FRACUNIT, V_HUDTRANS, 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) 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)) if (stplyr->laps == (UINT8)(cv_numlaps.value - 1))
{ {
V_DrawFixedPatch((62 - (32*max(0, progress-76)))*FRACUNIT, // 27 V_DrawFixedPatch((62 - (32*max(0, progress-76)))*FRACUNIT, // 27
(-6)*FRACUNIT, // 24 30*FRACUNIT, // 24
FRACUNIT, V_HUDTRANS, FRACUNIT, V_HUDTRANS,
kp_lapanim_final[min(progress/2, 10)], NULL); kp_lapanim_final[min(progress/2, 10)], NULL);
if (progress/2-12 >= 0) if (progress/2-12 >= 0)
{ {
V_DrawFixedPatch((188 + (32*max(0, progress-76)))*FRACUNIT, // 194 V_DrawFixedPatch((188 + (32*max(0, progress-76)))*FRACUNIT, // 194
(-6)*FRACUNIT, // 24 30*FRACUNIT, // 24
FRACUNIT, V_HUDTRANS, FRACUNIT, V_HUDTRANS,
kp_lapanim_lap[min(progress/2-12, 6)], NULL); kp_lapanim_lap[min(progress/2-12, 6)], NULL);
} }
@ -7590,21 +7595,21 @@ static void K_drawLapStartAnim(void)
else else
{ {
V_DrawFixedPatch((82 - (32*max(0, progress-76)))*FRACUNIT, // 61 V_DrawFixedPatch((82 - (32*max(0, progress-76)))*FRACUNIT, // 61
(-6)*FRACUNIT, // 24 30*FRACUNIT, // 24
FRACUNIT, V_HUDTRANS, FRACUNIT, V_HUDTRANS,
kp_lapanim_lap[min(progress/2, 6)], NULL); kp_lapanim_lap[min(progress/2, 6)], NULL);
if (progress/2-8 >= 0) if (progress/2-8 >= 0)
{ {
V_DrawFixedPatch((188 + (32*max(0, progress-76)))*FRACUNIT, // 194 V_DrawFixedPatch((188 + (32*max(0, progress-76)))*FRACUNIT, // 194
(-6)*FRACUNIT, // 24 30*FRACUNIT, // 24
FRACUNIT, V_HUDTRANS, FRACUNIT, V_HUDTRANS,
kp_lapanim_number[(((UINT32)stplyr->laps+1) / 10)][min(progress/2-8, 2)], NULL); kp_lapanim_number[(((UINT32)stplyr->laps+1) / 10)][min(progress/2-8, 2)], NULL);
if (progress/2-10 >= 0) if (progress/2-10 >= 0)
{ {
V_DrawFixedPatch((208 + (32*max(0, progress-76)))*FRACUNIT, // 221 V_DrawFixedPatch((208 + (32*max(0, progress-76)))*FRACUNIT, // 221
(-6)*FRACUNIT, // 24 30*FRACUNIT, // 24
FRACUNIT, V_HUDTRANS, FRACUNIT, V_HUDTRANS,
kp_lapanim_number[(((UINT32)stplyr->laps+1) % 10)][min(progress/2-10, 2)], NULL); kp_lapanim_number[(((UINT32)stplyr->laps+1) % 10)][min(progress/2-10, 2)], NULL);
} }