thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-03 23:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove Eggman monitor early detonation, allow using rings during the countdown

Browse source
This commit is contained in:
TehRealSalt 2019-03-11 11:01:01 -04:00
parent d11394f1bd
commit 5afe936dd9
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/k_kart.c
View file

@ -5463,8 +5463,7 @@ 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] || player->kartstuff[k_growshrinktimer]
|| 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;
@ -5529,14 +5528,8 @@ 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
else if (player->kartstuff[k_eggmanheld]) if (player->kartstuff[k_eggmanheld])
{ {
if (ATTACK_IS_DOWN) if (ATTACK_IS_DOWN)
{ {