vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Also lets do this for kitchen sinks

Browse source 
They also ignored in K_DropHnextList
This commit is contained in:
Ashnal 2020-07-23 20:12:35 -04:00
parent 6562c9b755
commit 733aefa64a
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/k_kart.c
View file

@ -3877,7 +3877,7 @@ void K_DropRocketSneaker(player_t *player)
mobj_t *shoe = player->mo; mobj_t *shoe = player->mo;
fixed_t flingangle; fixed_t flingangle;
boolean leftshoe = true; //left shoie is first boolean leftshoe = true; //left shoe is first
while ((shoe = shoe->hnext) && !P_MobjWasRemoved(shoe)) while ((shoe = shoe->hnext) && !P_MobjWasRemoved(shoe))
{ {
if (shoe->type != MT_ROCKETSNEAKER) if (shoe->type != MT_ROCKETSNEAKER)
@ -3912,6 +3912,19 @@ void K_DropRocketSneaker(player_t *player)
player->kartstuff[k_rocketsneakertimer] = 0; player->kartstuff[k_rocketsneakertimer] = 0;
} }
void K_DropKitchenSink(player_t *player)
{
if (!(player->mo && !P_MobjWasRemoved(player->mo) && player->mo->hnext && !P_MobjWasRemoved(player->mo->hnext)))
return;
if (player->mo->hnext->type != MT_SINK_SHIELD)
return; //so we can just call this function regardless of what is being held
P_KillMobj(player->mo->hnext, NULL, NULL);
P_SetTarget(&player->mo->hnext, NULL);
}
// When an item in the hnext chain dies. // When an item in the hnext chain dies.
void K_RepairOrbitChain(mobj_t *orbit) void K_RepairOrbitChain(mobj_t *orbit)
{ {
@ -5237,12 +5250,12 @@ void K_KartUpdatePosition(player_t *player)
// //
void K_StripItems(player_t *player) void K_StripItems(player_t *player)
{ {
K_DropRocketSneaker(player);
K_DropKitchenSink(player);
player->kartstuff[k_itemtype] = KITEM_NONE; player->kartstuff[k_itemtype] = KITEM_NONE;
player->kartstuff[k_itemamount] = 0; player->kartstuff[k_itemamount] = 0;
player->kartstuff[k_itemheld] = 0; player->kartstuff[k_itemheld] = 0;
K_DropRocketSneaker(player);
if (!player->kartstuff[k_itemroulette] || player->kartstuff[k_roulettetype] != 2) if (!player->kartstuff[k_itemroulette] || player->kartstuff[k_roulettetype] != 2)
{ {
player->kartstuff[k_itemroulette] = 0; player->kartstuff[k_itemroulette] = 0;