stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 05:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some safeguards for K_DropRocketSneaker usage

Browse source
This commit is contained in:
Ashnal 2020-07-14 19:45:15 -04:00
parent 0637ed89aa
commit 943a898352
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/k_kart.c
View file

@ -3872,11 +3872,17 @@ void K_DropItems(player_t *player)
void K_DropRocketSneaker(player_t *player) void K_DropRocketSneaker(player_t *player)
{ {
if (!(player->mo && !P_MobjWasRemoved(player->mo) && player->mo->hnext && !P_MobjWasRemoved(player->mo->hnext)))
return;
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 shoie is first
while ((shoe = shoe->hnext) && !P_MobjWasRemoved(shoe)) while ((shoe = shoe->hnext) && !P_MobjWasRemoved(shoe))
{ {
if (shoe->type != MT_ROCKETSNEAKER)
return; //woah, not a rocketsneaker, bail! safeguard in case this gets used when you're holding non-rocketsneakers
shoe->flags2 &= ~MF2_DONTDRAW; shoe->flags2 &= ~MF2_DONTDRAW;
shoe->flags &= ~MF_NOGRAVITY; shoe->flags &= ~MF_NOGRAVITY;
shoe->angle += ANGLE_45; shoe->angle += ANGLE_45;

2
src/p_inter.c
View file

@ -408,9 +408,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
} }
else else
{ {
if (player->kartstuff[k_rocketsneakertimer])
K_DropRocketSneaker(player); K_DropRocketSneaker(player);
K_DropItems(player); //K_StripItems(player); K_DropItems(player); //K_StripItems(player);
//K_StripOther(player); //K_StripOther(player);
player->kartstuff[k_itemroulette] = 1; player->kartstuff[k_itemroulette] = 1;