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

Merge branch 'allow-whip-in-spindash' into 'master'

Browse source 
Whip fixups no.69

See merge request KartKrew/Kart!1575
This commit is contained in:
toaster 2023-10-24 09:04:53 +00:00
commit 1fecdc7ed5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/k_collide.cpp
View file

@ -869,7 +869,7 @@ boolean K_InstaWhipCollide(mobj_t *shield, mobj_t *victim)
attacker->renderflags &= ~RF_DONTDRAW; attacker->renderflags &= ~RF_DONTDRAW;
attackerPlayer->spindashboost = 0; attackerPlayer->spindashboost = 0;
attackerPlayer->sneakertimer = 0; attackerPlayer->sneakertimer = 0;
attackerPlayer->instaWhipCharge = GUARDBREAK_COOLDOWN; attackerPlayer->instaWhipCharge = 0;
attackerPlayer->guardCooldown = GUARDBREAK_COOLDOWN; attackerPlayer->guardCooldown = GUARDBREAK_COOLDOWN;
attackerPlayer->flashing = 0; attackerPlayer->flashing = 0;

6
src/k_kart.c
View file

@ -8327,9 +8327,9 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
// If the button stays held, delay charge a bit. // If the button stays held, delay charge a bit.
if (player->instaWhipChargeLockout) if (player->instaWhipChargeLockout)
player->instaWhipChargeLockout--; player->instaWhipChargeLockout--;
if (player->rings > 0 || player->itemamount || player->ringdelay) if (player->rings > 0 || player->itemamount || player->ringdelay || player->rocketsneakertimer)
player->instaWhipChargeLockout = INSTAWHIP_HOLD_DELAY; player->instaWhipChargeLockout = INSTAWHIP_HOLD_DELAY;
if (!(player->cmd.buttons & BT_ATTACK)) // Deliberate Item button release, no need to protect you from lockout else if (!(player->cmd.buttons & BT_ATTACK)) // Deliberate Item button release, no need to protect you from lockout
player->instaWhipChargeLockout = 0; player->instaWhipChargeLockout = 0;
if (player->instaWhipCharge && player->instaWhipCharge < INSTAWHIP_CHARGETIME) if (player->instaWhipCharge && player->instaWhipCharge < INSTAWHIP_CHARGETIME)
@ -11088,7 +11088,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
player->instaWhipCooldown = 0; player->instaWhipCooldown = 0;
} }
if (leveltime < starttime || player->spindash || player->pflags & (PF_ITEMOUT|PF_EGGMANOUT) || player->rocketsneakertimer || player->instaWhipCooldown) if (leveltime < starttime || player->pflags & (PF_ITEMOUT|PF_EGGMANOUT) || player->rocketsneakertimer || player->instaWhipCooldown)
{ {
chargingwhip = false; chargingwhip = false;
player->instaWhipCharge = 0; player->instaWhipCharge = 0;