thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'minimap-tidy' into 'master'

Browse source 
Minimap Tidy

See merge request KartKrew/Kart!1239
This commit is contained in:
Sal 2023-05-17 03:01:50 +00:00
commit cf120e7d8e
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/k_hud.c
View file

@ -3695,7 +3695,7 @@ static void K_drawKartMinimap(void)
localplayers[i] = -1; localplayers[i] = -1;
// Player's tiny icons on the Automap. (drawn opposite direction so player 1 is drawn last in splitscreen) // Player's tiny icons on the Automap. (drawn opposite direction so player 1 is drawn last in splitscreen)
if (ghosts && doprogressionbar == true) // future work: show ghosts on progression bar if (ghosts && doprogressionbar == false) // future work: show ghosts on progression bar
{ {
demoghost *g = ghosts; demoghost *g = ghosts;
while (g) while (g)
@ -3754,11 +3754,20 @@ static void K_drawKartMinimap(void)
if (mobj->health <= 0 && (players[i].pflags & PF_NOCONTEST)) if (mobj->health <= 0 && (players[i].pflags & PF_NOCONTEST))
{ {
if (P_MobjWasRemoved(mobj->tracer))
{
continue;
}
if (mobj->tracer->renderflags & RF_DONTDRAW)
{
continue;
}
workingPic = kp_nocontestminimap; workingPic = kp_nocontestminimap;
colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE); colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE);
if (mobj->tracer && !P_MobjWasRemoved(mobj->tracer)) mobj = mobj->tracer;
mobj = mobj->tracer;
} }
else else
{ {
@ -3923,11 +3932,20 @@ static void K_drawKartMinimap(void)
if (mobj->health <= 0 && (players[localplayers[i]].pflags & PF_NOCONTEST)) if (mobj->health <= 0 && (players[localplayers[i]].pflags & PF_NOCONTEST))
{ {
if (P_MobjWasRemoved(mobj->tracer))
{
continue;
}
if (mobj->tracer->renderflags & RF_DONTDRAW)
{
continue;
}
workingPic = kp_nocontestminimap; workingPic = kp_nocontestminimap;
colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE); colormap = R_GetTranslationColormap(TC_DEFAULT, mobj->color, GTC_CACHE);
if (mobj->tracer && !P_MobjWasRemoved(mobj->tracer)) mobj = mobj->tracer;
mobj = mobj->tracer;
} }
else else
{ {