Bring back Eggman detonation

This commit is contained in:
TehRealSalt 2019-04-09 13:13:53 -04:00
parent 3b352bceea
commit 25dd4b7b44

View file

@ -5759,7 +5759,8 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|| player->kartstuff[k_itemamount] || player->kartstuff[k_itemamount]
|| player->kartstuff[k_itemroulette] || player->kartstuff[k_itemroulette]
|| player->kartstuff[k_growshrinktimer] // Being disabled during Shrink was unintended but people seemed to be okay with it sooo... || player->kartstuff[k_growshrinktimer] // Being disabled during Shrink was unintended but people seemed to be okay with it sooo...
|| player->kartstuff[k_rocketsneakertimer])) || player->kartstuff[k_rocketsneakertimer]
|| player->kartstuff[k_eggmanexplode]))
player->kartstuff[k_userings] = 1; player->kartstuff[k_userings] = 1;
else else
player->kartstuff[k_userings] = 0; player->kartstuff[k_userings] = 0;
@ -5825,8 +5826,14 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
// Other items // Other items
else else
{ {
// Eggman Monitor exploding
if (player->kartstuff[k_eggmanexplode])
{
if (ATTACK_IS_DOWN && player->kartstuff[k_eggmanexplode] <= 3*TICRATE && player->kartstuff[k_eggmanexplode] > 1)
player->kartstuff[k_eggmanexplode] = 1;
}
// Eggman Monitor throwing // Eggman Monitor throwing
if (player->kartstuff[k_eggmanheld]) else if (player->kartstuff[k_eggmanheld])
{ {
if (ATTACK_IS_DOWN) if (ATTACK_IS_DOWN)
{ {