mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-12-08 09:02:53 +00:00
Charge instawhip test fixes 3
This commit is contained in:
parent
17cfff1dfd
commit
763a7e03bf
1 changed files with 2 additions and 1 deletions
|
|
@ -11035,6 +11035,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
||||||
chargingwhip = false;
|
chargingwhip = false;
|
||||||
releasedwhip = (ATTACK_IS_DOWN && player->rings <= 0);
|
releasedwhip = (ATTACK_IS_DOWN && player->rings <= 0);
|
||||||
player->instaWhipCharge = INSTAWHIP_CHARGETIME;
|
player->instaWhipCharge = INSTAWHIP_CHARGETIME;
|
||||||
|
player->instaWhipCooldown = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (leveltime < starttime || player->spindash || player->pflags & (PF_ITEMOUT|PF_EGGMANOUT) || player->rocketsneakertimer || player->instaWhipCooldown)
|
if (leveltime < starttime || player->spindash || player->pflags & (PF_ITEMOUT|PF_EGGMANOUT) || player->rocketsneakertimer || player->instaWhipCooldown)
|
||||||
|
|
@ -11063,7 +11064,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
||||||
{
|
{
|
||||||
if ((leveltime%(INSTAWHIP_RINGDRAINEVERY)) == 0 && !(gametyperules & GTR_SPHERES))
|
if ((leveltime%(INSTAWHIP_RINGDRAINEVERY)) == 0 && !(gametyperules & GTR_SPHERES))
|
||||||
{
|
{
|
||||||
if (player->rings > -20)
|
if (player->rings > -20 && P_IsDisplayPlayer(player))
|
||||||
S_StartSound(player->mo, sfx_antiri);
|
S_StartSound(player->mo, sfx_antiri);
|
||||||
player->rings--;
|
player->rings--;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue