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

Shrink does not remove SPB

Browse source
This commit is contained in:
Sally Coolatta 2022-09-23 03:41:27 -04:00
parent f89d8d15c2
commit 13caae7a0e
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/k_kart.c
View file

@ -6032,16 +6032,22 @@ static void K_DoShrink(player_t *user)
{ {
mobj_t *mobj, *next; mobj_t *mobj, *next;
S_StartSound(user->mo, sfx_kc46); // Sound the BANG! S_StartSound(NULL, sfx_kc46); // Sound the BANG!
user->pflags |= PF_ATTACKDOWN; user->pflags |= PF_ATTACKDOWN;
Obj_CreateShrinkPohbees(user); Obj_CreateShrinkPohbees(user);
#if 1
// kill everything in the kitem list while we're at it: // kill everything in the kitem list while we're at it:
for (mobj = kitemcap; mobj; mobj = next) for (mobj = kitemcap; mobj; mobj = next)
{ {
next = mobj->itnext; next = mobj->itnext;
if (mobj->type == MT_SPB)
{
continue;
}
// check if the item is being held by a player behind us before removing it. // check if the item is being held by a player behind us before removing it.
// check if the item is a "shield" first, bc i'm p sure thrown items keep the player that threw em as target anyway // check if the item is a "shield" first, bc i'm p sure thrown items keep the player that threw em as target anyway
@ -6060,10 +6066,8 @@ static void K_DoShrink(player_t *user)
mobj->destscale = 0; mobj->destscale = 0;
mobj->flags &= ~(MF_SOLID|MF_SHOOTABLE|MF_SPECIAL); mobj->flags &= ~(MF_SOLID|MF_SHOOTABLE|MF_SPECIAL);
mobj->flags |= MF_NOCLIPTHING; // Just for safety mobj->flags |= MF_NOCLIPTHING; // Just for safety
if (mobj->type == MT_SPB)
spbplace = -1;
} }
#endif
} }
void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound) void K_DoPogoSpring(mobj_t *mo, fixed_t vertispeed, UINT8 sound)