vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix offsets, add colormapping

This commit is contained in:
TehRealSalt 2018-10-31 22:38:43 -04:00
parent 3378888cff
commit 4369917912
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/k_kart.c
View File

@ -7376,41 +7376,48 @@ static void K_drawLapStartAnim(void)
{
// This is an EVEN MORE insanely complicated animation.
const UINT8 progress = 80-stplyr->kartstuff[k_lapanimation];
UINT8 *colormap = R_GetTranslationColormap(TC_DEFAULT, stplyr->skincolor, 0);
V_DrawScaledPatch(BASEVIDWIDTH/2 + (32*max(0, stplyr->kartstuff[k_lapanimation]-76)),
56 - (32*max(0, progress-76)),
0, kp_lapanim_emblem);
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);
if (stplyr->laps == (UINT8)(cv_numlaps.value - 1))
{
V_DrawScaledPatch(27 - (32*max(0, progress-76)),
32,
0, kp_lapanim_final[min(progress/2, 10)]);
V_DrawFixedPatch((62 - (32*max(0, progress-76)))*FRACUNIT, // 27
(-6)*FRACUNIT, // 24
FRACUNIT, V_HUDTRANS,
kp_lapanim_final[min(progress/2, 10)], NULL);
if (progress/2-12 >= 0)
{
V_DrawScaledPatch(194 + (32*max(0, progress-76)),
32,
0, kp_lapanim_lap[min(progress/2-12, 6)]);
V_DrawFixedPatch((188 + (32*max(0, progress-76)))*FRACUNIT, // 194
(-6)*FRACUNIT, // 24
FRACUNIT, V_HUDTRANS,
kp_lapanim_lap[min(progress/2-12, 6)], NULL);
}
}
else
{
V_DrawScaledPatch(61 - (32*max(0, progress-76)),
32,
0, kp_lapanim_lap[min(progress/2, 6)]);
V_DrawFixedPatch((82 - (32*max(0, progress-76)))*FRACUNIT, // 61
(-6)*FRACUNIT, // 24
FRACUNIT, V_HUDTRANS,
kp_lapanim_lap[min(progress/2, 6)], NULL);
if (progress/2-8 >= 0)
{
V_DrawScaledPatch(194 + (32*max(0, progress-76)),
32,
0, kp_lapanim_number[(((UINT32)stplyr->laps+1) / 10)][min(progress/2-8, 2)]);
V_DrawFixedPatch((188 + (32*max(0, progress-76)))*FRACUNIT, // 194
(-6)*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_DrawScaledPatch(221 + (32*max(0, progress-76)),
32,
0, kp_lapanim_number[(((UINT32)stplyr->laps+1) % 10)][min(progress/2-10, 2)]);
V_DrawFixedPatch((208 + (32*max(0, progress-76)))*FRACUNIT, // 221
(-6)*FRACUNIT, // 24
FRACUNIT, V_HUDTRANS,
kp_lapanim_number[(((UINT32)stplyr->laps+1) % 10)][min(progress/2-10, 2)], NULL);
}
}
}