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

Pickmeup teams

Browse source
This commit is contained in:
Antonio Martinez 2025-05-16 18:11:10 -04:00
parent b62f3c65a8
commit 99318e3567
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_hud.cpp
View file

@ -1962,14 +1962,14 @@ static void K_drawBackupItem(void)
fx += 26;
fy += 5;
tx += 10;
ty += 10;
ty += 18;
}
else if (tiny && (R_GetViewNumber() & 1)) // P2/P4 4P
{
fx += -4;
fy += 5;
tx += -5;
ty += 10;
tx += 1;
ty += 18;
}
else // 1P/2P
{

5
src/k_hud_track.cpp
View file

@ -403,7 +403,10 @@ bool is_object_tracking_target(const mobj_t* mobj)
case MT_LANDMINE:
case MT_BANANA:
case MT_BANANA_SHIELD:
return (mobj->target && !P_MobjWasRemoved(mobj->target) && mobj->target->player && stplyr == mobj->target->player);
return (mobj->target && !P_MobjWasRemoved(mobj->target) && (
(mobj->target->player && stplyr == mobj->target->player)
|| (mobj->target->player && G_SameTeam(stplyr, mobj->target->player))
);
default:
return false;

11
src/k_kart.c
View file

@ -15568,7 +15568,16 @@ boolean K_TryPickMeUp(mobj_t *m1, mobj_t *m2)
inflictor = m1;
}
if (inflictor->target != victim)
if (!victim->player)
return false;
boolean allied = (inflictor->target == victim);
if (!allied)
if (inflictor->target->player && G_SameTeam(inflictor->target->player, victim->player))
allied = true;
if (!allied)
return false;
// CONS_Printf("target check passed\n");