thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'desperation-leniency' into 'master'

Browse source 
More friendly desperation spindash

See merge request KartKrew/Kart!983
This commit is contained in:
toaster 2023-02-27 11:37:32 +00:00
commit c5a6d1169c
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/k_kart.c
View file

@ -9729,6 +9729,7 @@ static void K_KartSpindash(player_t *player)
player->spindash = 0; player->spindash = 0;
S_ReducedVFXSound(player->mo, sfx_s23c, player); S_ReducedVFXSound(player->mo, sfx_s23c, player);
S_StopSoundByID(player->mo, sfx_kc38);
} }
@ -9780,11 +9781,15 @@ static void K_KartSpindash(player_t *player)
UINT8 ringdropframes = 2 + (player->kartspeed + player->kartweight); UINT8 ringdropframes = 2 + (player->kartspeed + player->kartweight);
boolean spawnOldEffect = true; boolean spawnOldEffect = true;
if (player->rings <= 0) // Use the damn spindash
player->spindash++; // I am no longer asking
INT16 chargetime = MAXCHARGETIME - ++player->spindash; INT16 chargetime = MAXCHARGETIME - ++player->spindash;
if (player->rings <= 0 && chargetime >= 0) // Desperation spindash
{
player->spindash++;
if (!S_SoundPlaying(player->mo, sfx_kc38))
S_StartSound(player->mo, sfx_kc38);
}
if (player->spindash >= SPINDASHTHRUSTTIME) if (player->spindash >= SPINDASHTHRUSTTIME)
{ {
K_KartSpindashDust(player->mo); K_KartSpindashDust(player->mo);