thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-12-20 06:53:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't lose Garden Top from stumble damage

Browse source 
Move to K_PopPlayerShield
This commit is contained in:
James R 2023-03-21 19:05:00 -07:00
parent 01dbbc34d1
commit efdcec6734
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/k_kart.c
View file

@ -6107,15 +6107,19 @@ void K_PopPlayerShield(player_t *player)
return; return;
} }
switch (shield)
{
case KSHIELD_NONE:
// Doesn't apply to non-S3K shields. // Doesn't apply to non-S3K shields.
if (shield == KSHIELD_NONE || shield == KSHIELD_TOP)
{
return; return;
}
if (shield == KSHIELD_LIGHTNING) case KSHIELD_TOP:
{ Obj_GardenTopDestroy(player);
return; // everything is handled by Obj_GardenTopDestroy
case KSHIELD_LIGHTNING:
K_DoLightningShield(player); K_DoLightningShield(player);
break;
} }
player->curshield = KSHIELD_NONE; player->curshield = KSHIELD_NONE;
@ -6178,12 +6182,10 @@ void K_DropHnextList(player_t *player)
orbit = false; orbit = false;
type = MT_EGGMANITEM; type = MT_EGGMANITEM;
break; break;
case MT_GARDENTOP:
Obj_GardenTopDestroy(player);
return;
// intentionally do nothing // intentionally do nothing
case MT_ROCKETSNEAKER: case MT_ROCKETSNEAKER:
case MT_SINK_SHIELD: case MT_SINK_SHIELD:
case MT_GARDENTOP:
return; return;
default: default:
continue; continue;