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

Don't draw screen edge arrows for pickmeups

Browse source
This commit is contained in:
Antonio Martinez 2025-05-28 17:20:05 -04:00
parent 1de1fec92e
commit 5d4dc6e297
3 changed files with 47 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/k_hud_track.cpp
View file

@ -143,6 +143,8 @@ struct TargetTracking
return false; return false;
default: default:
if (K_IsPickMeUpItem(mobj->type))
return false;
return true; return true;
} }
} }
@ -277,28 +279,17 @@ private:
{{6, 2, {kp_spraycantarget_far[1]}, V_ADD}}, // 4P {{6, 2, {kp_spraycantarget_far[1]}, V_ADD}}, // 4P
}}, }},
}; };
default:
case MT_JAWZ: if (K_IsPickMeUpItem(mobj->type))
case MT_JAWZ_SHIELD: {
case MT_ORBINAUT:
case MT_ORBINAUT_SHIELD:
case MT_DROPTARGET:
case MT_DROPTARGET_SHIELD:
case MT_LANDMINE:
case MT_BANANA:
case MT_BANANA_SHIELD:
case MT_GACHABOM:
case MT_EGGMANITEM:
case MT_EGGMANITEM_SHIELD:
case MT_BUBBLESHIELDTRAP:
return { return {
{ // Near { // Near
{2, TICRATE/2, {kp_pickmeup}, 0}, // 1P {2, TICRATE/2, {kp_pickmeup}, 0}, // 1P
{{2, TICRATE/2, {kp_pickmeup}, 0}}, // 4P {{2, TICRATE/2, {kp_pickmeup}, 0}}, // 4P
}, },
}; };
}
default:
return { return {
{ // Near { // Near
{8, 2, {kp_capsuletarget_near[0]}}, // 1P {8, 2, {kp_capsuletarget_near[0]}}, // 1P
@ -902,21 +893,9 @@ void K_drawTargetHUD(const vector3_t* origin, player_t* player)
if (tracking) if (tracking)
{ {
fixed_t itemOffset = 36*mobj->scale; fixed_t itemOffset = 36*mobj->scale;
switch (mobj->type)
if (K_IsPickMeUpItem(mobj->type))
{ {
case MT_JAWZ:
case MT_JAWZ_SHIELD:
case MT_ORBINAUT:
case MT_ORBINAUT_SHIELD:
case MT_DROPTARGET:
case MT_DROPTARGET_SHIELD:
case MT_LANDMINE:
case MT_BANANA:
case MT_BANANA_SHIELD:
case MT_GACHABOM:
case MT_BUBBLESHIELDTRAP:
case MT_EGGMANITEM:
case MT_EGGMANITEM_SHIELD:
if (stplyr->mo->eflags & MFE_VERTICALFLIP) if (stplyr->mo->eflags & MFE_VERTICALFLIP)
{ {
pos.z -= itemOffset; pos.z -= itemOffset;
@ -925,9 +904,6 @@ void K_drawTargetHUD(const vector3_t* origin, player_t* player)
{ {
pos.z += itemOffset; pos.z += itemOffset;
} }
break;
default:
break;
} }
K_ObjectTracking(&tr.result, &pos, false); K_ObjectTracking(&tr.result, &pos, false);

23
src/k_kart.c
View file

@ -15795,6 +15795,29 @@ void K_BotHitPenalty(player_t *player)
} }
} }
boolean K_IsPickMeUpItem(mobjtype_t type)
{
switch (type)
{
case MT_JAWZ:
case MT_JAWZ_SHIELD:
case MT_ORBINAUT:
case MT_ORBINAUT_SHIELD:
case MT_DROPTARGET:
case MT_DROPTARGET_SHIELD:
case MT_LANDMINE:
case MT_BANANA:
case MT_BANANA_SHIELD:
case MT_GACHABOM:
case MT_EGGMANITEM:
case MT_EGGMANITEM_SHIELD:
case MT_BUBBLESHIELDTRAP:
return true;
default:
return false;
}
}
static boolean K_PickUp(player_t *player, mobj_t *picked) static boolean K_PickUp(player_t *player, mobj_t *picked)
{ {
SINT8 type = -1; SINT8 type = -1;

2
src/k_kart.h
View file

@ -325,6 +325,8 @@ boolean K_LegacyRingboost(player_t *player);
void K_BotHitPenalty(player_t *player); void K_BotHitPenalty(player_t *player);
boolean K_IsPickMeUpItem(mobjtype_t type);
boolean K_TryPickMeUp(mobj_t *m1, mobj_t *m2); boolean K_TryPickMeUp(mobj_t *m1, mobj_t *m2);
fixed_t K_TeamComebackMultiplier(player_t *player); fixed_t K_TeamComebackMultiplier(player_t *player);