thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'minimap-fixup' into 'master'

Browse source 
Colorize minimap finish line

See merge request KartKrew/Kart!2193
This commit is contained in:
Oni 2024-03-31 05:53:49 +00:00
commit e2230bb3c8
1 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/k_hud.cpp
View file

@ -4307,6 +4307,8 @@ static void K_drawKartMinimap(void)
boolean doprogressionbar = false; boolean doprogressionbar = false;
boolean dofade = false, doencore = false; boolean dofade = false, doencore = false;
UINT8 minipal;
// Draw the HUD only when playing in a level. // Draw the HUD only when playing in a level.
// hu_stuff needs this, unlike st_stuff. // hu_stuff needs this, unlike st_stuff.
if (gamestate != GS_LEVEL) if (gamestate != GS_LEVEL)
@ -4378,22 +4380,45 @@ static void K_drawKartMinimap(void)
minimaptrans = ((10-minimaptrans)<<FF_TRANSSHIFT); minimaptrans = ((10-minimaptrans)<<FF_TRANSSHIFT);
// Really looking forward to never writing this loop again
UINT8 bestplayer = MAXPLAYERS;
for (i = 0; i < MAXPLAYERS; i++)
{
if (!playeringame[i])
continue;
if (players[i].spectator)
continue;
if (players[i].position == 1)
bestplayer = i;
}
if (bestplayer == MAXPLAYERS || leveltime < starttime) // POSITION / no players
minipal = ((leveltime/10)%2) ? SKINCOLOR_WHITE : SKINCOLOR_BLACK;
else if (players[bestplayer].laps >= numlaps) // Final lap
minipal = K_RainbowColor(leveltime);
else // Standard: color to leader
minipal = players[bestplayer].skincolor;
if (doencore) if (doencore)
{ {
V_DrawScaledPatch( V_DrawFixedPatch(
x + (SHORT(workingPic->width)/2), (x + (SHORT(workingPic->width)/2))*FRACUNIT,
y - (SHORT(workingPic->height)/2), (y - (SHORT(workingPic->height)/2))*FRACUNIT,
FRACUNIT,
splitflags|minimaptrans|V_FLIP, splitflags|minimaptrans|V_FLIP,
workingPic workingPic,
R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolornum_t>(minipal), GTC_CACHE)
); );
} }
else else
{ {
V_DrawScaledPatch( V_DrawFixedPatch(
x - (SHORT(workingPic->width)/2), (x - (SHORT(workingPic->width)/2))*FRACUNIT,
y - (SHORT(workingPic->height)/2), (y - (SHORT(workingPic->height)/2))*FRACUNIT,
FRACUNIT,
splitflags|minimaptrans, splitflags|minimaptrans,
workingPic workingPic,
R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolornum_t>(minipal), GTC_CACHE)
); );
} }