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

Ring Box items aren't real items

Browse source
This commit is contained in:
AJ Martinez 2023-06-14 23:59:45 -07:00
parent 28a65043f9
commit a18f84255b
3 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/k_kart.c
View file

@ -6595,7 +6595,7 @@ void K_DropItems(player_t *player)
{ {
K_DropHnextList(player); K_DropHnextList(player);
if (player->mo && !P_MobjWasRemoved(player->mo) && player->itemamount > 0) if (player->mo && !P_MobjWasRemoved(player->mo) && player->itemamount > 0 && !K_IsRingBoxItem(player->itemtype))
{ {
mobj_t *drop = K_CreatePaperItem( mobj_t *drop = K_CreatePaperItem(
player->mo->x, player->mo->y, player->mo->z + player->mo->height/2, player->mo->x, player->mo->y, player->mo->z + player->mo->height/2,
@ -12135,4 +12135,20 @@ boolean K_Cooperative(void)
return false; return false;
} }
boolean K_IsRingBoxItem(SINT8 itemtype)
{
switch (itemtype)
{
case KITEM_BAR:
case KITEM_DOUBLEBAR:
case KITEM_TRIPLEBAR:
case KITEM_SLOTRING:
case KITEM_SEVEN:
case KITEM_JACKPOT:
return true;
default:
return true;
}
}
//} //}

1
src/k_kart.h
View file

@ -220,6 +220,7 @@ tic_t K_TimeLimitForGametype(void);
UINT32 K_PointLimitForGametype(void); UINT32 K_PointLimitForGametype(void);
boolean K_Cooperative(void); boolean K_Cooperative(void);
boolean K_IsRingBoxItem(SINT8 itemtype);
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"

3
src/objects/hyudoro.c
View file

@ -446,6 +446,9 @@ hyudoro_patrol_hit_player
if (!player->itemamount) if (!player->itemamount)
return false; return false;
if (K_IsRingBoxItem(player->itemtype))
return false;
K_AddHitLag(toucher, TICRATE/2, false); K_AddHitLag(toucher, TICRATE/2, false);
hyudoro_mode(hyu) = HYU_RETURN; hyudoro_mode(hyu) = HYU_RETURN;