Merge branch 'eggman-drop-items' into 'master'

Drop items when hitting Egg Mark

See merge request KartKrew/Kart!1064
This commit is contained in:
toaster 2023-03-19 17:27:02 +00:00
commit cd7d4f23c7

View file

@ -148,6 +148,7 @@ boolean K_EggItemCollide(mobj_t *t1, mobj_t *t2)
if (!P_CanPickupItem(t2->player, 2)) if (!P_CanPickupItem(t2->player, 2))
return true; return true;
K_DropItems(t2->player);
K_StartEggmanRoulette(t2->player); K_StartEggmanRoulette(t2->player);
if (t2->player->flamedash && t2->player->itemtype == KITEM_FLAMESHIELD) if (t2->player->flamedash && t2->player->itemtype == KITEM_FLAMESHIELD)