Merge branch 'no-minimap-dot-for-others' into 'master'

Minimap: only show dot indicating player angle for local party players

See merge request KartKrew/Kart!1764
This commit is contained in:
Oni 2024-01-05 01:11:53 +00:00
commit b1bcc727fe

View file

@ -4149,8 +4149,6 @@ static void K_drawKartMinimap(void)
{ {
for (i = MAXPLAYERS-1; i >= 0; i--) for (i = MAXPLAYERS-1; i >= 0; i--)
{ {
boolean nocontest = false;
if (!playeringame[i]) if (!playeringame[i])
continue; continue;
if (!players[i].mo || players[i].spectator || !players[i].mo->skin if (!players[i].mo || players[i].spectator || !players[i].mo->skin
@ -4194,8 +4192,6 @@ static void K_drawKartMinimap(void)
colormap = R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolornum_t>(mobj->color), GTC_CACHE); colormap = R_GetTranslationColormap(TC_DEFAULT, static_cast<skincolornum_t>(mobj->color), GTC_CACHE);
mobj = mobj->tracer; mobj = mobj->tracer;
nocontest = true;
} }
else else
{ {
@ -4227,23 +4223,6 @@ static void K_drawKartMinimap(void)
{ {
K_drawKartMinimapIcon(interpx, interpy, x, y, splitflags, kp_wantedreticle, NULL); K_drawKartMinimapIcon(interpx, interpy, x, y, splitflags, kp_wantedreticle, NULL);
} }
if (!nocontest)
{
angle_t ang = R_InterpolateAngle(mobj->old_angle, mobj->angle);
if (encoremode)
ang = ANGLE_180 - ang;
K_drawKartMinimapIcon(
interpx,
interpy,
x + FixedMul(FCOS(ang), ICON_DOT_RADIUS),
y - FixedMul(FSIN(ang), ICON_DOT_RADIUS),
splitflags,
kp_minimapdot,
colormap
);
}
} }
else else
{ {